diff options
author | grant <grant> | 2004-01-26 12:10:24 +0000 |
---|---|---|
committer | grant <grant> | 2004-01-26 12:10:24 +0000 |
commit | be13f03773b6323f31e9ca152e3549493ed69578 (patch) | |
tree | 3198bcaa9e4d49eafc4a2fa102be1053cbfba817 /lang | |
parent | e628326064fc60337ff36cf9c41e232fa99bd91d (diff) | |
download | pkgsrc-be13f03773b6323f31e9ca152e3549493ed69578.tar.gz |
fix build and install on Solaris:
- use -h instead of -soname= when creating shared objects to appease
Solaris linker.
- link against librt for fdatasync().
- tweak PLIST for installed modules.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/python23/Makefile.common | 21 | ||||
-rw-r--r-- | lang/python23/PLIST.common | 8 | ||||
-rw-r--r-- | lang/python23/distinfo | 4 | ||||
-rw-r--r-- | lang/python23/patches/patch-ah | 13 |
4 files changed, 31 insertions, 15 deletions
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common index 904a50aa0a9..5f8e8283f8d 100644 --- a/lang/python23/Makefile.common +++ b/lang/python23/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2004/01/26 11:50:29 grant Exp $ +# $NetBSD: Makefile.common,v 1.5 2004/01/26 12:10:24 grant Exp $ # DISTNAME= Python-2.3.3 @@ -16,6 +16,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= OPT="${CFLAGS}" +# fdatasync() +LIBS.SunOS= -lrt + .include "../../mk/bsd.prefs.mk" PLIST_SRC= ${.CURDIR}/../../lang/python23/PLIST.common @@ -44,18 +47,22 @@ PLIST_SUBST+= DLMODULE="@comment " PLIST_SUBST+= DLMODULE= .endif -X86_SUBST= "@comment " +EXTRA_SO_SUBST= "@comment " OSSAUDIODEV_SUBST= "@comment " + +# activate extra modules .if ${MACHINE_ARCH} == "i386" -# activate X86_ONLY modules -X86_SUBST= +EXTRA_SO_SUBST= # ossaudiodev is only available on x86 for the following platforms -.if ${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" \ +. if ${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" \ || ${PY_PLATNAME} == "freebsd5" OSSAUDIODEV_SUBST= +. endif +.elif ${OPSYS} == "SunOS" +EXTRA_SO_SUBST= .endif -.endif -PLIST_SUBST+= X86_ONLY=${X86_SUBST} + +PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST} PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST} # ensure that the bsddb185 module is built on all platforms diff --git a/lang/python23/PLIST.common b/lang/python23/PLIST.common index c7028733f50..cfeb76b4123 100644 --- a/lang/python23/PLIST.common +++ b/lang/python23/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.4 2004/01/24 19:48:11 recht Exp $ +@comment $NetBSD: PLIST.common,v 1.5 2004/01/26 12:10:24 grant Exp $ bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} include/python${PY_VER_SUFFIX}/Python.h @@ -1125,7 +1125,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so lib/python${PY_VER_SUFFIX}/lib-dynload/array.so -${X86_ONLY}lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so +${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so @@ -1138,7 +1138,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so ${DLMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so -${X86_ONLY}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so +${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so lib/python${PY_VER_SUFFIX}/lib-dynload/math.so lib/python${PY_VER_SUFFIX}/lib-dynload/md5.so @@ -1150,7 +1150,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/pcre.so lib/python${PY_VER_SUFFIX}/lib-dynload/pwd.so lib/python${PY_VER_SUFFIX}/lib-dynload/regex.so lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so -${X86_ONLY}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so +${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so ${OSSAUDIODEV}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so lib/python${PY_VER_SUFFIX}/lib-dynload/rotor.so lib/python${PY_VER_SUFFIX}/lib-dynload/select.so diff --git a/lang/python23/distinfo b/lang/python23/distinfo index b2de11aef99..d3d91e0b2b8 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2003/12/23 17:24:42 recht Exp $ +$NetBSD: distinfo,v 1.10 2004/01/26 12:10:24 grant Exp $ SHA1 (Python-2.3.3.tgz) = 034d2e3ed011ea753d4fee7efab16e31029b1e5e Size (Python-2.3.3.tgz) = 8491380 bytes @@ -6,6 +6,6 @@ SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3 SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14 -SHA1 (patch-ah) = 6e44407c89edcee59b1f674783544884e96cf101 +SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575 SHA1 (patch-al) = 3678af129442eb5602f2c8ccec7dc7030b554775 SHA1 (patch-am) = 8580ec64d2d369f4426e30368e10d350aac82c03 diff --git a/lang/python23/patches/patch-ah b/lang/python23/patches/patch-ah index fc71f6a103b..025f4e92ffc 100644 --- a/lang/python23/patches/patch-ah +++ b/lang/python23/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.1 2003/12/08 21:13:56 recht Exp $ +$NetBSD: patch-ah,v 1.2 2004/01/26 12:10:24 grant Exp $ ---- Makefile.pre.in.orig 2003-09-20 12:50:28.000000000 +0200 +--- Makefile.pre.in.orig 2003-11-19 06:54:00.000000000 +1100 +++ Makefile.pre.in @@ -56,7 +56,7 @@ MAKESETUP= $(srcdir)/Modules/makese OPT= @OPT@ @@ -20,3 +20,12 @@ $NetBSD: patch-ah,v 1.1 2003/12/08 21:13:56 recht Exp $ platform: $(BUILDPYTHON) $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform +@@ -345,7 +345,7 @@ $(LIBRARY): $(LIBRARY_OBJS) + + libpython$(VERSION).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ +- $(LDSHARED) -Wl,-soname=$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ ++ $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ + $(LN) -f $(INSTSONAME) $@; \ + else\ + $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ |