diff options
| author | dmcmahill <dmcmahill> | 2003-02-06 10:54:17 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2003-02-06 10:54:17 +0000 |
| commit | 6f9f5bee0ec0e99d4635f9431e759cdbcec724e6 (patch) | |
| tree | 2165afd42f6b511df9b6382beab991f4cd3f7410 /devel/gnustep-make | |
| parent | 364ca471597f41ce0c2b130d3d58efdbfb8a36c2 (diff) | |
| download | pkgsrc-6f9f5bee0ec0e99d4635f9431e759cdbcec724e6.tar.gz | |
teach GNUstep to deal with the fact that some NetBSD ELF systems (such as
alpha, and probably pmax) show up as 'netbsd' while others (such as i386)
show up as 'netbsdelf'. Should fix problems on all ELF systems which
come up as 'netbsd'.
Diffstat (limited to 'devel/gnustep-make')
| -rw-r--r-- | devel/gnustep-make/Makefile | 10 | ||||
| -rw-r--r-- | devel/gnustep-make/distinfo | 3 | ||||
| -rw-r--r-- | devel/gnustep-make/patches/patch-ac | 25 |
3 files changed, 32 insertions, 6 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index df81c2c49a4..cde7515511b 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/01/03 04:02:25 rh Exp $ +# $NetBSD: Makefile,v 1.6 2003/02/06 10:54:17 dmcmahill Exp $ # DISTNAME= gnustep-make-1.5.1 @@ -20,10 +20,10 @@ CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" PLIST_SUBST+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU} PLIST_SUBST+= APPEND_ELF=${APPEND_ELF} -post-extract: - ${CP} ${WRKSRC}/target.make ${WRKSRC}/target.make.orig \ - && ${SED} 's!/usr/pkg!${LOCALBASE}!g' \ - ${WRKSRC}/target.make.orig > ${WRKSRC}/target.make +post-patch: + ${CP} ${WRKSRC}/target.make ${WRKSRC}/target.make.bak && \ + ${SED} -e 's;/usr/pkg;${LOCALBASE};g' -e 's;@object_fmt@;${LOWER_OPSYS}-${OBJECT_FMT};g' \ + ${WRKSRC}/target.make.bak > ${WRKSRC}/target.make post-install: .for sub in System Local diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo index 2dff2d2db87..fd143509813 100644 --- a/devel/gnustep-make/distinfo +++ b/devel/gnustep-make/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2003/01/03 04:02:26 rh Exp $ +$NetBSD: distinfo,v 1.4 2003/02/06 10:54:17 dmcmahill Exp $ SHA1 (gnustep-make-1.5.1.tar.gz) = 009b727a7aa68ed868a0e030fe3c8fe58d70ffad Size (gnustep-make-1.5.1.tar.gz) = 333780 bytes SHA1 (patch-aa) = 4969ea2cbd61e4bc2dab109abcbbdf5177ebdd8c SHA1 (patch-ab) = 09ff1a67ee88e40d7d4efa3a8417757e62f6fa4b +SHA1 (patch-ac) = ef564b5997853b75e9c13958dbb4baedca270d46 diff --git a/devel/gnustep-make/patches/patch-ac b/devel/gnustep-make/patches/patch-ac new file mode 100644 index 00000000000..196168aaf1d --- /dev/null +++ b/devel/gnustep-make/patches/patch-ac @@ -0,0 +1,25 @@ +$NetBSD: patch-ac,v 1.1 2003/02/06 10:54:18 dmcmahill Exp $ + +work around the fact that some systems like i386 report either +netbsd (a.out) or netbsdelf (elf) while others like alpha report +netbsd (elf). This was making alpha be set incorrectly to a.out + +--- target.make.orig Fri Nov 15 15:14:59 2002 ++++ target.make Thu Feb 6 05:45:23 2003 +@@ -720,7 +720,7 @@ + #################################################### + # +-# NetBSD ++# NetBSD a.out + # +-ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd) ++ifeq (@object_fmt@,netbsd-a.out) + # This is disabled temporarily, because I don't know exactly how + # to link shared libs. Everything seems to link correctly now but +@@ -754,5 +754,5 @@ + # NetBSD ELF + # +-ifeq ($(findstring netbsdelf, $(GNUSTEP_TARGET_OS)), netbsdelf) ++ifeq (@object_fmt@,netbsd-ELF) + HAVE_SHARED_LIBS = yes + SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib |