diff options
author | tron <tron@pkgsrc.org> | 2010-01-26 12:15:26 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2010-01-26 12:15:26 +0000 |
commit | 561ed45ed3b60c6c75f74b9380e61c0611c3b8a7 (patch) | |
tree | e1da479e9f5747c2ed29ef3979e11686ed702896 /lang/python26 | |
parent | bdfe5f28837cb708b737c3298de68b76b77e3dfc (diff) | |
download | pkgsrc-561ed45ed3b60c6c75f74b9380e61c0611c3b8a7.tar.gz |
Fix build problems under Mac OS X reported by Taylor R Campbell
on the "pkgsrc-users" mailing list:
1.) Fix 64-Bit ABI check for Snow Leopard so it doesn't break the build
on older version of Mac OS X.
2.) Properly disable the "pyexpat" module and remove it from the
package list.
Bump package revision because of these changes.
Diffstat (limited to 'lang/python26')
-rw-r--r-- | lang/python26/Makefile | 6 | ||||
-rw-r--r-- | lang/python26/PLIST.common | 3 | ||||
-rw-r--r-- | lang/python26/distinfo | 4 | ||||
-rw-r--r-- | lang/python26/patches/patch-am | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 04101ef3acf..039714c5cf3 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2010/01/21 16:28:51 heinz Exp $ +# $NetBSD: Makefile,v 1.19 2010/01/26 12:15:26 tron Exp $ DISTNAME= Python-2.6.4 PKGNAME= ${DISTNAME:S/Python/python26/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang python MASTER_SITES= http://www.python.org/ftp/python/2.6.4/ EXTRACT_SUFX= .tar.bz2 @@ -110,7 +110,7 @@ PLIST.oss= yes INSTALL_UNSTRIPPED= yes PLIST_VARS+= nav -. if ${ABI} != "64" +. if !defined(ABI) || ${ABI} != "64" PLIST.nav= yes . endif .endif diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common index 66733e231b4..02efb1c8f6a 100644 --- a/lang/python26/PLIST.common +++ b/lang/python26/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.7 2009/11/03 02:20:54 wiz Exp $ +@comment $NetBSD: PLIST.common,v 1.8 2010/01/26 12:15:26 tron Exp $ bin/2to3 bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1729,7 +1729,6 @@ ${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so ${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.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/select.so lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so diff --git a/lang/python26/distinfo b/lang/python26/distinfo index da9809bfb12..2648f0126d4 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2009/11/16 21:12:05 jakllsch Exp $ +$NetBSD: distinfo,v 1.18 2010/01/26 12:15:26 tron Exp $ SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13 RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a @@ -10,7 +10,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e -SHA1 (patch-am) = d531f1ddb7a7bac9c56d9b947f8a0a2666c9c017 +SHA1 (patch-am) = 952cadccc4cef28da7f297f35a5073dcce38033b SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am index d2e8f59b480..ba26c937a62 100644 --- a/lang/python26/patches/patch-am +++ b/lang/python26/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.7 2009/11/16 10:40:21 joerg Exp $ +$NetBSD: patch-am,v 1.8 2010/01/26 12:15:26 tron Exp $ Disabled modules for normal build: bsdddb @@ -19,7 +19,7 @@ Build the 1.85 compat module all the time against the BDB version of choice. # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "expat", "readline"] ++disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if |