diff options
| author | tron <tron@pkgsrc.org> | 2001-04-16 11:35:35 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-04-16 11:35:35 +0000 |
| commit | f7725fcbf5b7cb099b450ef88c84ba0af388d3ce (patch) | |
| tree | 4adb43776572bfab2898a66ef5dd75e30ea1c92d | |
| parent | 057a011d7074260a51dd465ee34ed8fd77f361e3 (diff) | |
| download | pkgsrc-f7725fcbf5b7cb099b450ef88c84ba0af388d3ce.tar.gz | |
Reorder include path to avoid build problems on systems with "gettext-lib"
package installed following a hint by John Darrow. This fixes PR pkg/12675
my myself.
| -rw-r--r-- | shells/bash2/files/patch-sum | 7 | ||||
| -rw-r--r-- | shells/bash2/patches/patch-aa | 15 | ||||
| -rw-r--r-- | shells/bash2/patches/patch-ab | 17 |
3 files changed, 32 insertions, 7 deletions
diff --git a/shells/bash2/files/patch-sum b/shells/bash2/files/patch-sum index 22ec6a5ee61..9fc648e69ea 100644 --- a/shells/bash2/files/patch-sum +++ b/shells/bash2/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.3 2000/03/30 11:56:32 wiz Exp $ +$NetBSD: patch-sum,v 1.4 2001/04/16 11:35:35 tron Exp $ -MD5 (patch-ab) = b6a0c310aaa0daf47f8e1ddcf3c94e01 -MD5 (patch-ae) = 9b785c38c94aac20f39451fee24407a6 +SHA1 (patch-aa) = 6a7733599ce07ca1c6257a96f41b985f25ad5a00 +SHA1 (patch-ab) = c206cb77dfc151bc32d3d56fc1253a01d60a21d5 +SHA1 (patch-ae) = f55a728f9f8ce8896a7097100de80db1d1cf752f diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa new file mode 100644 index 00000000000..7905f2fdb99 --- /dev/null +++ b/shells/bash2/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.7 2001/04/16 11:35:36 tron Exp $ + +--- builtins/Makefile.in.orig Sat Oct 14 23:35:28 2000 ++++ builtins/Makefile.in Mon Apr 16 13:29:42 2001 +@@ -48,8 +48,8 @@ + + INCLUDES = -I. -I.. @RL_INCLUDE@ -I$(topdir) -I$(BASHINCDIR) -I$(topdir)/lib -I$(srcdir) + +-CCFLAGS = ${PROFILE_FLAGS} $(DEFS) $(LOCAL_DEFS) $(SYSTEM_FLAGS) $(CPPFLAGS) \ +- ${INCLUDES} $(LOCAL_CFLAGS) $(CFLAGS) ++CCFLAGS = ${PROFILE_FLAGS} $(DEFS) $(LOCAL_DEFS) $(SYSTEM_FLAGS) ${INCLUDES} \ ++ $(CPPFLAGS) $(LOCAL_CFLAGS) $(CFLAGS) + + MKBUILTINS = mkbuiltins$(EXEEXT) + DIRECTDEFINE = -D $(srcdir) diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab index 461df092a99..918a8b1036e 100644 --- a/shells/bash2/patches/patch-ab +++ b/shells/bash2/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.5 2000/03/30 11:56:32 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2001/04/16 11:35:36 tron Exp $ ---- Makefile.in.orig Wed Mar 1 20:52:12 2000 -+++ Makefile.in Thu Mar 30 13:09:26 2000 -@@ -582,7 +582,7 @@ +--- Makefile.in.orig Tue Apr 3 21:03:24 2001 ++++ Makefile.in Mon Apr 16 12:44:31 2001 +@@ -111,7 +111,7 @@ + SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' + + CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \ +- $(DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS) ++ $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + + INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) -I$(includedir) + +@@ -599,7 +599,7 @@ install: .made installdirs $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program) |