Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/lang/python27/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/lang/python27/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.1.1.1 retrieving revision 1.34 diff -u -p -r1.1.1.1 -r1.34 --- pkgsrc/lang/python27/Makefile 2011/02/22 08:51:58 1.1.1.1 +++ pkgsrc/lang/python27/Makefile 2014/02/09 09:02:50 1.34 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/02/22 08:51:58 obache Exp $ +# $NetBSD: Makefile,v 1.34 2014/02/09 09:02:50 tron Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} +PKGREVISION= 1 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -10,8 +11,6 @@ HOMEPAGE= http://www.python.org/ COMMENT= Interpreted, interactive, object-oriented programming language LICENSE= python-software-foundation -PKG_DESTDIR_SUPPORT= user-destdir - CONFLICTS+= python-[0-9]* GNU_CONFIGURE= yes @@ -20,6 +19,9 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= OPT=${CFLAGS:Q} CONFIGURE_ARGS+= --with-system-ffi CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb +CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} + +PKGCONFIG_OVERRIDE+= Misc/python.pc.in LDFLAGS+= -L${WRKSRC} @@ -34,6 +36,13 @@ PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pth .endif +.include "../../mk/compiler.mk" + +# Clang needs -fwrapv +.if !empty(PKGSRC_COMPILER:Mclang) +CFLAGS+= -fwrapv +.endif + .include "../../mk/bsd.prefs.mk" # fdatasync() @@ -48,12 +57,14 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.common_end .if ${OPSYS} == "NetBSD" +. if !defined(USE_DESTDIR) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) PRIVILEGED_STAGES+= clean +. endif # XXX work around a botched autoconf check which ignores libintl CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes .endif -.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" +.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" PY_PLATNAME= ${LOWER_OPSYS} USE_TOOLS+= gmake .elif ${OPSYS} == "IRIX" @@ -62,6 +73,8 @@ PY_PLATNAME= ${LOWER_OPSYS:C/\..*//} PY_PLATNAME= sunos${OS_VERSION:C/\..*//} .elif ${OPSYS} == "HPUX" PY_PLATNAME= hp-ux11 +.elif ${OPSYS} == "Linux" +PY_PLATNAME= linux2 .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif @@ -69,7 +82,7 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ - (defined(ABI) && ${ABI} == "64") + (${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64") IS_64BIT_PLATFORM?= yes .else IS_64BIT_PLATFORM?= no @@ -83,9 +96,9 @@ PLIST.dl= yes # builds additional modules if OpenSSL < 0.9.8 PLIST_VARS+= openssl097 -CHECK_BUILTIN.openssl:= no -.include "../../security/openssl/builtin.mk" CHECK_BUILTIN.openssl:= yes +.include "../../security/openssl/builtin.mk" +CHECK_BUILTIN.openssl:= no .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \ !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*) PLIST.openssl097= yes @@ -102,6 +115,12 @@ PLIST.extra-so= yes INSTALL_UNSTRIPPED= yes .endif +# For Xcode 5 we need to search the SDK path for headers, otherwise certain +# modules will not be built. +.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include) +CFLAGS+= -I${OSX_SDK_PATH}/usr/include +.endif + PLIST_VARS+= dll nis no-nis .if ${OPSYS} == "IRIX" . if ${ABI} == "64" @@ -111,7 +130,9 @@ PLIST.nis= yes . endif .else PLIST.dll= yes -. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) +. if ${OPSYS} == "MirBSD" +# neither nis nor no-nis +. elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) PLIST.nis= yes . else PLIST.no-nis= yes @@ -142,9 +163,8 @@ INSTALL_TARGET= altinstall REPLACE_INTERPRETER+= py27 REPLACE.py27.old= .*python[^ ]* REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} -REPLACE_FILES.py27= Lib/cgi.py # explicitly demanded to be patched -REPLACE_FILES.py27+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py -REPLACE_FILES.py27+= Lib/test/test_largefile.py Lib/test/test_optparse.py +REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py +REPLACE_FILES.py27+= Lib/*/*/*/*.py SUBST_CLASSES+= findlib SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. @@ -163,7 +183,6 @@ post-install: ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 .endif -USE_GNU_READLINE= yes BUILDLINK_DEPMETHOD.readline= build .include "../../archivers/bzip2/buildlink3.mk"