Date: Thu, 20 Jan 2005 03:51:47 +0100 From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: portmgr@FreeBSD.org Subject: ports/76488: [MAINTAINER] sysutils/e2fsprogs: fix compile Message-ID: <E1CrSQF-000BDz-G1@libertas.emma.line.org> Resent-Message-ID: <200501200300.j0K30kMn005182@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76488
>Category: ports
>Synopsis: [MAINTAINER] sysutils/e2fsprogs: fix compile
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 20 03:00:46 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 4.11-RC3 i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 4.11-RC3 FreeBSD 4.11-RC3 #17: Mon Jan 17 21:44:19 CET 2005
>Description:
The port compiles unreliably, compiling breaks when a previous version of
e2fsprogs is installed in /usr/local. The new patch below fixes the problem by
rearranging the compiler's -I options so that new headers get precedence before
the ones that may be in /usr/local.
This eliminates the need to compile with GCC 3, the corresponding USE_GCC is
removed.
Please commit before 4.11-RELEASE!
While touching the port, rename DISABLE_NLS option to WITHOUT_NLS for
consistency with other ports and to quiet the pertinent portlint warning.
Added file(s):
- files/patch-MCONFIG--I-order
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- e2fsprogs-1.35_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /root/e2fsprogs/Makefile
--- /usr/ports/sysutils/e2fsprogs/Makefile Mon Oct 4 11:58:25 2004
+++ /root/e2fsprogs/Makefile Thu Jan 20 03:45:38 2005
@@ -7,7 +7,7 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.35
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +15,7 @@
MAINTAINER= matthias.andree@gmx.de
COMMENT= Utilities and library to manipulate an ext2 or ext3 filesystem
-.if !defined(DISABLE_NLS)
+.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
.endif
@@ -29,7 +29,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
CONFIGURE_ENV+= CPPFLAGS='-I${WRKSRC}/lib -I${LOCALBASE}/include'
-.if defined(DISABLE_NLS)
+.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB= NLS="@comment "
.else
@@ -53,10 +53,10 @@
pre-everything::
@${ECHO_CMD} "-------------------------------------------------------------"
-.if defined(DISABLE_NLS)
- @${ECHO_CMD} "National language support disabled, -DDISABLE_NLS in effect. "
+.if defined(WITHOUT_NLS)
+ @${ECHO_CMD} "National language support disabled, -DWITHOUT_NLS in effect. "
.else
- @${ECHO_CMD} "Use -DDISABLE_NLS to build without national language support."
+ @${ECHO_CMD} "Use -DWITHOUT_NLS to build without national language support."
.endif
@${ECHO_CMD} "-------------------------------------------------------------"
@@ -65,10 +65,6 @@
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 491000
-USE_GCC= 3.4
-.endif
post-patch:
${REINPLACE_CMD} -e 's|-DRESOURCE_TRACK||' ${WRKSRC}/e2fsck/Makefile.in
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-MCONFIG--I-order /root/e2fsprogs/files/patch-MCONFIG--I-order
--- /usr/ports/sysutils/e2fsprogs/files/patch-MCONFIG--I-order Thu Jan 1 01:00:00 1970
+++ /root/e2fsprogs/files/patch-MCONFIG--I-order Thu Jan 20 03:44:20 2005
@@ -0,0 +1,34 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/20 03:17:31+01:00 matthias.andree@gmx.de
+# MCONFIG.in:
+# Rearrange -I options to give local includes precedence over
+# /usr/local/include, to unbreak the build when an older
+# e2fsprogs version (with includes) is installed under
+# /usr/local (for instance, on FreeBSD).
+#
+# MCONFIG.in
+# 2005/01/20 03:16:52+01:00 matthias.andree@gmx.de +2 -3
+# Rearrange -I options to give local includes precedence over
+# /usr/local/include, to unbreak the build when an older
+# e2fsprogs version (with includes) is installed under
+# /usr/local (for instance, on FreeBSD).
+#
+diff -Nru a/MCONFIG.in b/MCONFIG.in
+--- a/MCONFIG.in 2005-01-20 03:43:02 +01:00
++++ b/MCONFIG.in 2005-01-20 03:43:02 +01:00
+@@ -34,11 +34,10 @@
+ BUILD_CC = @BUILD_CC@
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ CFLAGS = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
+ INTL_FLAGS = @INTL_FLAGS@
+ ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
+- $(INTL_FLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib \
+- $(LINUX_INCLUDE)
++ $(INTL_FLAGS) $(LINUX_INCLUDE)
+ LDFLAGS = @LDFLAGS@
+ ALL_LDFLAGS = $(LDFLAGS)
+ RM = @RM@
--- e2fsprogs-1.35_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1CrSQF-000BDz-G1>