summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo>2005-09-01 14:24:06 +0000
committersalo <salo>2005-09-01 14:24:06 +0000
commitf1e279e4569163fa900c3bcd33dabb912669635a (patch)
tree3bc2903375d21ec88e34bce3f1807e5c152c54e1
parenta7b71f6878321cda340407c1b12cb25cf81b85a4 (diff)
downloadpkgsrc-f1e279e4569163fa900c3bcd33dabb912669635a.tar.gz
Pullup ticket 727 - requested by D'Arcy J.M. Cain
build fix for python24 modules Revisions pulled up: - pkgsrc/lang/python24/Makefile 1.11 - pkgsrc/lang/python24/distinfo 1.13 - pkgsrc/lang/python24/patches/patch-al 1.7 Module Name: pkgsrc Committed By: darcy Date: Wed Aug 31 12:13:03 UTC 2005 Modified Files: pkgsrc/lang/python24: distinfo pkgsrc/lang/python24/patches: patch-al Log Message: Fix problem where LDFLAGS is not being expanded on the command line. Patch supplied by KISHIMOTO, Makoto <ksmakoto (you know what ) dd.iij4u.or.jp> Closes PR 31027 --- Module Name: pkgsrc Committed By: darcy Date: Thu Sep 1 13:14:35 UTC 2005 Modified Files: pkgsrc/lang/python24: Makefile Log Message: Bump PKGREVISION for change made to patches/patch-al in revision 1.7 as suggested by Lubomir Sedlacik in discussions on releng-pkgsrc and pullup request 727.
-rw-r--r--lang/python24/Makefile3
-rw-r--r--lang/python24/distinfo4
-rw-r--r--lang/python24/patches/patch-al8
3 files changed, 8 insertions, 7 deletions
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index dfd3eb9bd03..08016238c6a 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/05/10 22:27:44 abs Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2005/09/01 14:24:06 salo Exp $
#
DISTNAME= Python-2.4.1
PKGNAME= python24-2.4.1
+PKGREVISION= 3
CATEGORIES= lang python
MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.1/
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 855d0a080a7..f5f24ccff8c 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9.2.1 2005/08/20 16:01:13 salo Exp $
+$NetBSD: distinfo,v 1.9.2.2 2005/09/01 14:24:06 salo Exp $
SHA1 (Python-2.4.1.tar.bz2) = a4b58cf31359198dbb123b789440bcaf9052d198
RMD160 (Python-2.4.1.tar.bz2) = 8c682c9af21666cc6b8eaa08f8719eed231ab3ad
@@ -14,5 +14,5 @@ SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = d8365c06b5a309c6fc196a607fafa8cda27cb982
+SHA1 (patch-al) = 258a60e97ce6c9fcfa5b6321fad1db270f1f99ad
SHA1 (patch-am) = 9ce50340d76e8612384f94d4b03414d3f38e35d3
diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al
index 6e248daf62e..a676127ccc3 100644
--- a/lang/python24/patches/patch-al
+++ b/lang/python24/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.6 2005/05/09 20:37:51 recht Exp $
+$NetBSD: patch-al,v 1.6.2.1 2005/09/01 14:24:06 salo Exp $
--- configure.orig 2005-03-29 01:23:02.000000000 +0200
+++ configure 2005-05-09 21:14:53.000000000 +0200
@@ -78,7 +78,7 @@ $NetBSD: patch-al,v 1.6 2005/05/09 20:37:51 recht Exp $
fi
;;
- Linux*|GNU*) LDSHARED='$(CC) -shared';;
-+ Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
++ Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";;
BSD/OS*/4*) LDSHARED="gcc -shared";;
OpenBSD*|FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
@@ -87,8 +87,8 @@ $NetBSD: patch-al,v 1.6 2005/05/09 20:37:51 recht Exp $
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
- NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";;
-+ NetBSD*|DragonFly*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
-+ Interix*) LDSHARED='$(CC) -shared ${LDFLAGS}';; # XXX tv needs image-base hack
++ NetBSD*|DragonFly*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";;
++ Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'