diff options
| author | drochner <drochner@pkgsrc.org> | 2003-08-18 09:14:13 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2003-08-18 09:14:13 +0000 |
| commit | 3b5068cba8ab536abcff647536fcf9a91a046095 (patch) | |
| tree | d79709a5b77fe95afa106816ca9db932380c899a /lang | |
| parent | c7e49537309392d3930bae4c81ceb2ec529bb5fa (diff) | |
| download | pkgsrc-3b5068cba8ab536abcff647536fcf9a91a046095.tar.gz | |
make distutils obey LDFLAGS set in the environment, analogous to
patches we've applied to Python-2.1+
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python20/Makefile | 4 | ||||
| -rw-r--r-- | lang/python20/distinfo | 3 | ||||
| -rw-r--r-- | lang/python20/patches/patch-cd | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 2cf87b71027..684443cfe76 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2003/07/17 21:45:13 grant Exp $ +# $NetBSD: Makefile,v 1.11 2003/08/18 09:14:15 drochner Exp $ # DISTNAME= Python-2.0.1 PKGNAME= python20-2.0.1 -PKGREVISION= 3 +PKGREVISION= 4 WRKSRC= ${WRKDIR}/Python-2.0.1 CATEGORIES= lang MASTER_SITES= ftp://ftp.python.org/pub/python/2.0.1/ diff --git a/lang/python20/distinfo b/lang/python20/distinfo index a1d6744349c..5ae71721dfa 100644 --- a/lang/python20/distinfo +++ b/lang/python20/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2003/06/06 18:14:10 drochner Exp $ +$NetBSD: distinfo,v 1.5 2003/08/18 09:14:16 drochner Exp $ SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab Size (python/Python-2.0.1.tgz) = 4097453 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = 2db263ea719733692536bb4a9990659099583351 SHA1 (patch-ab) = 670cd69d67566bf61d152e3433161c0f146be1b3 SHA1 (patch-ac) = 74ff40fc338e8209d91e5da11fdbed497462dd83 SHA1 (patch-ad) = 08096aea74ab4871309124cd28a3b98d83cb322f +SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc diff --git a/lang/python20/patches/patch-cd b/lang/python20/patches/patch-cd new file mode 100644 index 00000000000..9dbbfb69488 --- /dev/null +++ b/lang/python20/patches/patch-cd @@ -0,0 +1,22 @@ +$NetBSD: patch-cd,v 1.1 2003/08/18 09:14:13 drochner Exp $ + +--- Lib/distutils/command/build_ext.py.orig Sat Mar 31 18:09:32 2001 ++++ Lib/distutils/command/build_ext.py +@@ -445,8 +445,17 @@ class build_ext (Command): + # that go into the mix. + if ext.extra_objects: + objects.extend(ext.extra_objects) ++ ++ # Two possible sources for extra linker arguments: ++ # - 'extra_link_args' in Extension object ++ # - LDFLAGS environment variable ++ # The environment variable should take precedence, and ++ # any sensible compiler will give precedence to later ++ # command line args. Hence we combine them in order: + extra_args = ext.extra_link_args or [] + ++ if os.environ.has_key('LDFLAGS'): ++ extra_args.extend(string.split(os.environ['LDFLAGS'])) + + self.compiler.link_shared_object( + objects, ext_filename, |