From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 6 11:30:51 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C211416A4CE for ; Tue, 6 Jan 2004 11:30:51 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE5E43D68 for ; Tue, 6 Jan 2004 11:30:16 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i06JUFFR016924 for ; Tue, 6 Jan 2004 11:30:15 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i06JUFpB016923; Tue, 6 Jan 2004 11:30:15 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 6 Jan 2004 11:30:15 -0800 (PST) Resent-Message-Id: <200401061930.i06JUFpB016923@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nate Lawson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCF3D16A4CE for ; Tue, 6 Jan 2004 11:24:29 -0800 (PST) Received: from root.org (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id 0A7AF43D46 for ; Tue, 6 Jan 2004 11:24:29 -0800 (PST) (envelope-from nate@root.org) Received: (qmail 27108 invoked by uid 1000); 6 Jan 2004 19:24:29 -0000 Message-Id: <20040106112404.R27106@root.org> Date: Tue, 6 Jan 2004 11:24:29 -0800 (PST) From: Nate Lawson To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60988: PATCH: fix build of grub-0.92 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jan 2004 19:30:51 -0000 >Number: 60988 >Category: ports >Synopsis: PATCH: fix build of grub-0.92 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jan 06 11:30:15 PST 2004 >Closed-Date: >Last-Modified: >Originator: Nate Lawson >Release: FreeBSD 5.2-CURRENT i386 >Organization: FreeBSD >Environment: System: >Description: grub-0.92 port is broken on 5-CURRENT. Attached patches below fix the build. I don't have reiserfs so someone should test it but I believe the patch to it is simple. >How-To-Repeat: >Fix: ### Apply this patch to the port Makefile: --- Makefile.orig Mon Dec 22 22:12:18 2003 +++ Makefile Tue Jan 6 11:13:07 2004 @@ -37,12 +37,8 @@ .include -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile on FreeBSD ${OSVERSION}" -.endif - pre-build: - @${RM} ${WRKSRC}/docs/grub.info* + @${RM} -f ${WRKSRC}/docs/grub.info post-install: @${CAT} ${PKGMESSAGE} ### Add this patch as grub-0.92/files/patch-stage2_fsys_reiserfs.c: --- stage2/fsys_reiserfs.c.orig Tue Jan 6 11:05:27 2004 +++ stage2/fsys_reiserfs.c Tue Jan 6 11:05:59 2004 @@ -112,7 +112,7 @@ /* offset in the log of where to start replay after a crash */ __u32 j_first_unflushed_offset; /* mount id to detect very old transactions */ - __u32 long j_mount_id; + __u64 j_mount_id; }; /* magic string to find desc blocks in the journal */ >Release-Note: >Audit-Trail: >Unformatted: