diff options
author | drochner <drochner@pkgsrc.org> | 2002-09-04 14:25:17 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2002-09-04 14:25:17 +0000 |
commit | 0f9b8f5c2f516ca31fb0b8ab658c30d487c17f24 (patch) | |
tree | dc6d7bb31c10fb80d38c35c5fc5e6be1be6e24d6 | |
parent | 0c3a8c07e595c08bd4c61a965397a14b3dffd7eb (diff) | |
download | pkgsrc-0f9b8f5c2f516ca31fb0b8ab658c30d487c17f24.tar.gz |
the interpreter itself _can_ be built with buildlink2
-rw-r--r-- | lang/python21-pth/Makefile | 8 | ||||
-rw-r--r-- | lang/python21-pth/distinfo | 8 | ||||
-rw-r--r-- | lang/python21-pth/patches/patch-aa | 16 | ||||
-rw-r--r-- | lang/python21-pth/patches/patch-ac | 31 | ||||
-rw-r--r-- | lang/python21-pth/patches/patch-ae | 10 |
5 files changed, 30 insertions, 43 deletions
diff --git a/lang/python21-pth/Makefile b/lang/python21-pth/Makefile index 82a79b5223f..8d178983351 100644 --- a/lang/python21-pth/Makefile +++ b/lang/python21-pth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/04 14:25:17 drochner Exp $ # DISTNAME= Python-2.1.3 @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.python.org/ COMMENT= Interpreted, interactive, object-oriented programming language -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= yes GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-pth @@ -20,8 +20,8 @@ INSTALL_TARGET= altinstall post-extract: ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc2p1 -.include "../../devel/zlib/buildlink.mk" -.include "../../devel/pth/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../devel/pth/buildlink2.mk" .include "../../mk/bsd.pkg.mk" # This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one diff --git a/lang/python21-pth/distinfo b/lang/python21-pth/distinfo index 65956863610..808581e3788 100644 --- a/lang/python21-pth/distinfo +++ b/lang/python21-pth/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ +$NetBSD: distinfo,v 1.2 2002/09/04 14:25:17 drochner Exp $ SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4 Size (Python-2.1.3.tgz) = 6194432 bytes -SHA1 (patch-aa) = 8273acc49a9eedad6e09685098178f3b7fb8f1c6 +SHA1 (patch-aa) = d87aebf7b89a559e83c13a039fbdb98b39835211 SHA1 (patch-ab) = e39bbe1e46bfc535dc887eeb9059e0c500c393db -SHA1 (patch-ac) = fa69338ce8b819f833b518451ecfbf2f2395fd7e +SHA1 (patch-ac) = 042664030635fdcc1516c66b12568f1d5cb987d1 SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414 -SHA1 (patch-ae) = 7aa941ac7b2197ef6c4d1090df0b8a266d9c8dcc +SHA1 (patch-ae) = 079cd208ba57755a7e0f3ac03b6ba59d622be5db SHA1 (patch-af) = 2caa6dd54088b1866679338df2c1311c4718cf0f SHA1 (patch-ag) = fa9a5f13072d9137182675394f04cd9b163d3a5c diff --git a/lang/python21-pth/patches/patch-aa b/lang/python21-pth/patches/patch-aa index 35d40c6f816..eb3c0208577 100644 --- a/lang/python21-pth/patches/patch-aa +++ b/lang/python21-pth/patches/patch-aa @@ -1,13 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2002/09/04 14:25:18 drochner Exp $ ---- Misc/Makefile.pre.in.orig Wed Jan 16 20:18:58 2002 -+++ Misc/Makefile.pre.in Wed Jan 16 20:19:17 2002 -@@ -92,7 +92,7 @@ +--- Misc/Makefile.pre.in.orig Thu Aug 22 15:36:50 2002 ++++ Misc/Makefile.pre.in Thu Aug 22 15:36:55 2002 +@@ -92,10 +92,10 @@ TARGET= python # Installed python binary (used only by boot target) -PYTHON= python -+PYTHON= python2.1 ++PYTHON= python2p1 # Add more -I and -D options here - CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) +-CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) ++CFLAGS+= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) + + # These two variables can be set in Setup to merge extensions. + # See example[23]. diff --git a/lang/python21-pth/patches/patch-ac b/lang/python21-pth/patches/patch-ac index e766ca32fe0..4ec68c75433 100644 --- a/lang/python21-pth/patches/patch-ac +++ b/lang/python21-pth/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $ ---- setup.py.orig Thu Dec 27 16:51:02 2001 -+++ setup.py -@@ -145,11 +145,16 @@ +--- setup.py.orig Thu Dec 27 22:51:02 2001 ++++ setup.py Wed Aug 28 16:15:08 2002 +@@ -145,12 +145,6 @@ return platform def detect_modules(self): @@ -11,20 +11,11 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ - self.compiler.library_dirs.insert(0, '/usr/local/lib') - if '/usr/local/include' not in self.compiler.include_dirs: - self.compiler.include_dirs.insert(0, '/usr/local/include' ) -+ # Add the buildlink directories for pkgsrc -+ if os.environ.has_key('BUILDLINK_DIR'): -+ dir = os.environ['BUILDLINK_DIR'] -+ libdir = dir + '/lib' -+ incdir = dir + '/include' -+ if libdir not in self.compiler.library_dirs: -+ self.compiler.library_dirs.insert(0, libdir) -+ if incdir not in self.compiler.include_dirs: -+ self.compiler.include_dirs.insert(0, incdir) -+ - +- # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can -@@ -265,13 +270,13 @@ + # be assumed that no additional -I,-L directives are needed. +@@ -265,13 +259,13 @@ # These represent audio samples or images as strings: # Disabled on 64-bit platforms @@ -42,7 +33,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ # readline if self.compiler.find_library_file(lib_dirs, 'readline'): -@@ -296,14 +301,10 @@ +@@ -296,14 +290,10 @@ # socket(2) # Detect SSL support for the socket module ssl_incs = find_file('openssl/ssl.h', inc_dirs, @@ -59,7 +50,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ if (ssl_incs is not None and ssl_libs is not None): -@@ -408,8 +409,8 @@ +@@ -408,8 +398,8 @@ if (self.compiler.find_library_file(lib_dirs, 'ncurses')): curses_libs = ['ncurses'] @@ -70,7 +61,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform[:6] != 'darwin': # OSX has an old Berkeley curses, not good enough for the _curses module. if (self.compiler.find_library_file(lib_dirs, 'terminfo')): -@@ -417,8 +418,8 @@ +@@ -417,8 +407,8 @@ else: curses_libs = ['curses', 'termcap'] @@ -81,7 +72,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ # If the curses module is enabled, check for the panel module if (os.path.exists('Modules/_curses_panel.c') and -@@ -609,7 +610,7 @@ +@@ -609,7 +599,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python21-pth/patches/patch-ae b/lang/python21-pth/patches/patch-ae index e87f60bc911..d1826b0d782 100644 --- a/lang/python21-pth/patches/patch-ae +++ b/lang/python21-pth/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ +$NetBSD: patch-ae,v 1.2 2002/09/04 14:25:18 drochner Exp $ --- configure.orig Thu Dec 27 22:55:46 2001 +++ configure Tue Aug 20 20:12:59 2002 @@ -11,11 +11,3 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $ # Arguments passed to configure. -@@ -6456,6 +6456,7 @@ - trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - - DEFS=-DHAVE_CONFIG_H -+DEFS+=-I${BUILDLINK_DIR}/include - - # Without the "./", some shells look in PATH for config.status. - : ${CONFIG_STATUS=./config.status} |