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.59 retrieving revision 1.68 diff -u -p -r1.59 -r1.68 --- pkgsrc/lang/python27/Makefile 2016/05/25 16:56:41 1.59 +++ pkgsrc/lang/python27/Makefile 2016/12/30 10:53:21 1.68 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.59 2016/05/25 16:56:41 leot Exp $ +# $NetBSD: Makefile,v 1.68 2016/12/30 10:53:21 adam Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} -PKGREVISION= 2 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -82,9 +81,7 @@ PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION: .endif PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} -.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \ - (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \ - (${MACHINE_ARCH} == "ia64") || \ +.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \ (defined(ABI) && ${ABI} == "64") IS_64BIT_PLATFORM?= yes .else @@ -164,6 +161,26 @@ 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