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.39 retrieving revision 1.68 diff -u -p -r1.39 -r1.68 --- pkgsrc/lang/python27/Makefile 2014/03/27 05:36:37 1.39 +++ pkgsrc/lang/python27/Makefile 2016/12/30 10:53:21 1.68 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.39 2014/03/27 05:36:37 obache Exp $ +# $NetBSD: Makefile,v 1.68 2016/12/30 10:53:21 adam Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} -PKGREVISION= 3 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,6 +10,8 @@ HOMEPAGE= http://www.python.org/ COMMENT= Interpreted, interactive, object-oriented programming language LICENSE= python-software-foundation +DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts + CONFLICTS+= python-[0-9]* GNU_CONFIGURE= yes @@ -30,7 +31,8 @@ CHECK_PORTABILITY_SKIP= Tools/faqwiz/mov USE_LANGUAGES= c c++ -PTHREAD_OPTS+= require +PTHREAD_OPTS+= require +PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" .if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth @@ -57,9 +59,6 @@ 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 @@ -75,14 +74,15 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//} PY_PLATNAME= hp-ux11 .elif ${OPSYS} == "Linux" PY_PLATNAME= linux2 +.elif ${OS_VARIANT} == "SCOOSR5" +PY_PLATNAME= sco_sv3 .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} -.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ - (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ - (${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64") +.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \ + (defined(ABI) && ${ABI} == "64") IS_64BIT_PLATFORM?= yes .else IS_64BIT_PLATFORM?= no @@ -100,11 +100,6 @@ PLIST_VARS+= extra-so PLIST.extra-so= yes .endif -# Make sure python modules can link correctly -.if ${OPSYS} == "Darwin" -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) @@ -136,10 +131,8 @@ BUILDLINK_TRANSFORM+= rm:-ldb .endif CFLAGS+= -DHAVE_DB_185_H -.if ${OPSYS} == "OSF1" # configure complains about buggy getaddrinfo() -CONFIGURE_ARGS+= --disable-ipv6 -.endif +CONFIGURE_ARGS.OSF1+= --disable-ipv6 .if defined(BUILDLINK_TRANSFORM) MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} @@ -156,12 +149,50 @@ REPLACE.py27.new= ${PREFIX}/bin/python${ REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py REPLACE_FILES.py27+= Lib/*/*/*/*.py +SUBST_CLASSES+= libffi +SUBST_MESSAGE.libffi= Fixing libffi include path on Darwin. +SUBST_STAGE.libffi= pre-configure +SUBST_FILES.libffi= setup.py +SUBST_SED.libffi= -e 's,/usr/include/ffi,${BUILDLINK_PREFIX.libffi}/include,' + SUBST_CLASSES+= findlib SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. SUBST_STAGE.findlib= pre-configure SUBST_FILES.findlib= Lib/distutils/unixccompiler.py SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' +# XXX: It might be needed to add manually more paths like ${PREFIX}/qt5/lib +# Testing: +# >>> from ctypes.util import find_library +# >>> find_library("m") +# 'libm.so.0' +# >>> find_library("crypto") +# 'libcrypto.so.11' +# >>> find_library("GL") +# 'libGL.so.2' +# >>> find_library("curl") +# 'libcurl.so.4' + +SUBST_CLASSES+= pfindlib +SUBST_MESSAGE.pfindlib= Fixing find_library() on POSIX-like (excluding Darwin) systems. +SUBST_STAGE.pfindlib= pre-configure +SUBST_FILES.pfindlib= Lib/ctypes/util.py +SUBST_SED.pfindlib= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!' + +.include "options.mk" + +SUBST_CLASSES+= sslbase +SUBST_MESSAGE.sslbase= Fixing find-file for openssl with SSLBASE. +SUBST_STAGE.sslbase= pre-configure +SUBST_FILES.sslbase= setup.py +SUBST_VARS.sslbase= SSLBASE + +SUBST_CLASSES+= cacert +SUBST_MESSAGE.cacert= Configuring location of default CA certificate file. +SUBST_STAGE.cacert= pre-configure +SUBST_FILES.cacert= Modules/_ssl.c +SUBST_SED.cacert= -e 's,@PREFIX@,${PREFIX},' + post-extract: ${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} @@ -173,6 +204,12 @@ post-install: ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 .endif +.if ${OS_VARIANT} == "SCOOSR5" +# SCO OpenServer 5.0.7/3.2 has no socklen_t in system headers, but has in +# GNU pth's header. It should be used in this case. +CONFIGURE_ENV+= ac_cv_type_socklen_t=yes +.endif + BUILDLINK_DEPMETHOD.readline= build .include "../../archivers/bzip2/buildlink3.mk"