diff options
author | drochner <drochner@pkgsrc.org> | 2002-01-28 11:51:23 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2002-01-28 11:51:23 +0000 |
commit | 71e65aefa48906153ca6a9b89210e2af120ca766 (patch) | |
tree | 7a774146b3929db48e99d9a5cad7439f8752a18e /lang | |
parent | 4a11bb7668aefbc2e80acab49e8b6caac5d1384c (diff) | |
download | pkgsrc-71e65aefa48906153ca6a9b89210e2af120ca766.tar.gz |
-link the math, cmath and time modules against libm to make it more
embedding friendly, as suggested in PR pkg/14520 by Jarkko Torppa
-having to touch Setup.in anyway, comment out the non-64-bit-clean
modules regularily and remove the Makefile magic which led to the
same effect
Diffstat (limited to 'lang')
-rw-r--r-- | lang/python20/Makefile | 10 | ||||
-rw-r--r-- | lang/python20/files/Setup.in | 14 |
2 files changed, 10 insertions, 14 deletions
diff --git a/lang/python20/Makefile b/lang/python20/Makefile index b1dcd529b1d..c233df347a6 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/28 09:07:23 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2002/01/28 11:51:23 drochner Exp $ # DISTNAME= Python-2.0.1 @@ -39,21 +39,17 @@ SSLFLAGS= -DUSE_SSL -I/usr/include/openssl -lssl -lcrypto .include "../../mk/bsd.prefs.mk" -# don't build modules which don't work on all platforms -NO64BIT=\# .if ${OPSYS} == "SunOS" ZOULARIS?= ${PREFIX}/bsd MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib -R${ZOULARIS}/lib .endif pre-configure: - ${SED} -e 's,@NO64BIT@,${NO64BIT},g' \ - -e 's,@NOSHARED@,${NOSHARED},g' \ + ${SED} -e 's,@NOSHARED@,${NOSHARED},g' \ -e 's,@MODADD@,${MODADD},g' \ -e 's,@SSLFLAGS@,${SSLFLAGS},g' \ ${FILESDIR}/Setup.in >${WRKSRC}/Modules/Setup.in - ${SED} -e 's,@NO64BIT@,${NO64BIT},g' \ - -e 's,@NOSHARED@,${NOSHARED},g' \ + ${SED} -e 's,@NOSHARED@,${NOSHARED},g' \ -e 's,@MODADD@,${MODADD},g' \ ${FILESDIR}/Setup.config.in >${WRKSRC}/Modules/Setup.config.in diff --git a/lang/python20/files/Setup.in b/lang/python20/files/Setup.in index cff2dd905b0..08fc3b7682e 100644 --- a/lang/python20/files/Setup.in +++ b/lang/python20/files/Setup.in @@ -1,6 +1,6 @@ # -*- makefile -*- # -# $NetBSD: Setup.in,v 1.1.1.1 2002/01/16 18:40:48 drochner Exp $ +# $NetBSD: Setup.in,v 1.2 2002/01/28 11:51:24 drochner Exp $ # # The file Setup is used by the makesetup script to construct the files # Makefile and config.c, from Makefile.pre and config.c.in, @@ -130,11 +130,11 @@ GLHACK=-Dclear=__GLclear # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # -lm # complex math library functions -math mathmodule.c # -lm # math library functions, e.g. sin() +cmath cmathmodule.c -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry @@ -181,9 +181,9 @@ resource resource.c # Jeremy Hylton's rlimit interface # These don't work for 64-bit platforms!!! # These represent audio samples or images as strings: -@NO64BIT@audioop audioop.c # Operations on audio samples -@NO64BIT@imageop imageop.c # Operations on images -@NO64BIT@rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) +#audioop audioop.c # Operations on audio samples +#imageop imageop.c # Operations on images +#rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) # The md5 module implements the RSA Data Security, Inc. MD5 |