Cleanup PLIST.common, some modules don't build on 64-bit arch, ctypes.so should though (see patch-ad).

This commit is contained in:
Johann Franz 2007-09-14 02:01:50 +00:00 committed by Thomas Klausner
parent ca5cce419b
commit 5f8caa6b94
4 changed files with 26 additions and 10 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2007/08/04 06:09:40 thomasklausner Exp $
# $NetBSD: Makefile,v 1.3 2007/09/14 02:01:50 netcap Exp $
DISTNAME= Python-2.5.1
PKGNAME= python25-2.5.1
@ -113,7 +113,7 @@ PLIST_SUBST+= NOSHLIB="@comment "
.else
. include "../../mk/bdb.buildlink3.mk"
MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q}
MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}:Q}
MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
LIBS+= ${BDB_LIBS}
PLIST_SUBST+= BSDDBMODULE=

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.3 2007/09/13 05:57:00 netcap Exp $
@comment $NetBSD: PLIST.common,v 1.4 2007/09/14 02:01:50 netcap Exp $
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}-config
@ -84,8 +84,8 @@ include/python${PY_VER_SUFFIX}/tupleobject.h
include/python${PY_VER_SUFFIX}/ucnhash.h
include/python${PY_VER_SUFFIX}/unicodeobject.h
include/python${PY_VER_SUFFIX}/weakrefobject.h
lib/libpython${PY_VER_SUFFIX}.so
lib/libpython${PY_VER_SUFFIX}.so.1.0
${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so
${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so.1.0
lib/python${PY_VER_SUFFIX}/BaseHTTPServer.py
lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyc
lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyo
@ -1547,19 +1547,21 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/collections.so
lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so
lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so
lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
lib/python${PY_VER_SUFFIX}/lib-dynload/dl.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
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/mmap.so
lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
${NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
${NO_NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
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/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.1 2007/07/31 05:01:38 bsadewitz Exp $
$NetBSD: distinfo,v 1.2 2007/09/14 02:01:50 netcap Exp $
SHA1 (Python-2.5.1.tar.bz2) = 993a66bd2dabb0c4f33ca98372576315ef113df6
RMD160 (Python-2.5.1.tar.bz2) = af0e8ed93bbc07015c338ae19bbee8811da21c1c
@ -6,6 +6,7 @@ Size (Python-2.5.1.tar.bz2) = 9383651 bytes
SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
SHA1 (patch-ab) = c573f73a2509a63fc269302015a7ff6eaa8fe6ff
SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f
SHA1 (patch-ad) = bc14a93114f637056ce13094d7d9624a66cd7b7f
SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce
SHA1 (patch-ah) = bb6cea365ba4db3e6967e4a87891b1fa6b014e2e
SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1

13
python25/patches/patch-ad Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-ad,v 1.1 2007/09/14 02:01:50 netcap Exp $
--- Modules/_ctypes/libffi/configure.orig 2006-08-14 18:17:41.000000000 +0200
+++ Modules/_ctypes/libffi/configure
@@ -3516,7 +3516,7 @@ arm*-*-rtems*) TARGET=ARM; TARGETDIR=arm
cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-netbsd* | amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;