Sat Jul 23 21:12:48 2016 UTC ()
Fix build for X11_TYPE != "native"

Noted by <wiz>
Solution suggested by <leot>


(kamil)
diff -r1.64 -r1.65 pkgsrc/lang/python27/Makefile
cvs diff -r1.64 -r1.65 pkgsrc/lang/python27/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python27/Makefile 2016/07/23 18:28:26 1.64
+++ pkgsrc/lang/python27/Makefile 2016/07/23 21:12:48 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.64 2016/07/23 18:28:26 kamil Exp $ 1# $NetBSD: Makefile,v 1.65 2016/07/23 21:12:48 kamil Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python27-${PY_DISTVERSION} 5PKGNAME= python27-${PY_DISTVERSION}
6PKGREVISION= 3 6PKGREVISION= 3
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.python.org/ 10HOMEPAGE= http://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts 14DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
@@ -176,26 +176,29 @@ SUBST_SED.findlib= -e 's,/usr/local,${PR @@ -176,26 +176,29 @@ SUBST_SED.findlib= -e 's,/usr/local,${PR
176 176
177SUBST_CLASSES+= pfindlib 177SUBST_CLASSES+= pfindlib
178SUBST_MESSAGE.pfindlib= Fixing find_library() on POSIX-like (excluding Darwin) systems. 178SUBST_MESSAGE.pfindlib= Fixing find_library() on POSIX-like (excluding Darwin) systems.
179SUBST_STAGE.pfindlib= pre-configure 179SUBST_STAGE.pfindlib= pre-configure
180SUBST_FILES.pfindlib= Lib/ctypes/util.py 180SUBST_FILES.pfindlib= Lib/ctypes/util.py
181SUBST_SED.pfindlib= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!' 181SUBST_SED.pfindlib= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!'
182 182
183SUBST_CLASSES+= cdlopen 183SUBST_CLASSES+= cdlopen
184SUBST_MESSAGE.cdlopen= Handle X11BASE paths in dlopen(3) calls of _ctypes.so 184SUBST_MESSAGE.cdlopen= Handle X11BASE paths in dlopen(3) calls of _ctypes.so
185SUBST_STAGE.cdlopen= pre-configure 185SUBST_STAGE.cdlopen= pre-configure
186SUBST_FILES.cdlopen= setup.py 186SUBST_FILES.cdlopen= setup.py
187SUBST_VARS.cdlopen= X11BASE 187SUBST_VARS.cdlopen= X11BASE
188 188
 189# Required to detect X11BASE paths in dlopen(3) calls of _ctypes.so
 190USE_X11= yes
 191
189SUBST_CLASSES+= sslbase 192SUBST_CLASSES+= sslbase
190SUBST_MESSAGE.sslbase= Fixing find-file for openssl with SSLBASE. 193SUBST_MESSAGE.sslbase= Fixing find-file for openssl with SSLBASE.
191SUBST_STAGE.sslbase= pre-configure 194SUBST_STAGE.sslbase= pre-configure
192SUBST_FILES.sslbase= setup.py 195SUBST_FILES.sslbase= setup.py
193SUBST_VARS.sslbase= SSLBASE 196SUBST_VARS.sslbase= SSLBASE
194 197
195SUBST_CLASSES+= cacert 198SUBST_CLASSES+= cacert
196SUBST_MESSAGE.cacert= Configuring location of default CA certificate file. 199SUBST_MESSAGE.cacert= Configuring location of default CA certificate file.
197SUBST_STAGE.cacert= pre-configure 200SUBST_STAGE.cacert= pre-configure
198SUBST_FILES.cacert= Modules/_ssl.c 201SUBST_FILES.cacert= Modules/_ssl.c
199SUBST_SED.cacert= -e 's,@PREFIX@,${PREFIX},' 202SUBST_SED.cacert= -e 's,@PREFIX@,${PREFIX},'
200 203
201post-extract: 204post-extract:
@@ -214,16 +217,14 @@ post-install: @@ -214,16 +217,14 @@ post-install:
214# GNU pth's header. It should be used in this case. 217# GNU pth's header. It should be used in this case.
215CONFIGURE_ENV+= ac_cv_type_socklen_t=yes 218CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
216.endif 219.endif
217 220
218BUILDLINK_DEPMETHOD.readline= build 221BUILDLINK_DEPMETHOD.readline= build
219 222
220.include "../../archivers/bzip2/buildlink3.mk" 223.include "../../archivers/bzip2/buildlink3.mk"
221.include "../../devel/gettext-lib/buildlink3.mk" 224.include "../../devel/gettext-lib/buildlink3.mk"
222.include "../../devel/libffi/buildlink3.mk" 225.include "../../devel/libffi/buildlink3.mk"
223.include "../../devel/readline/buildlink3.mk" 226.include "../../devel/readline/buildlink3.mk"
224.include "../../devel/zlib/buildlink3.mk" 227.include "../../devel/zlib/buildlink3.mk"
225.include "../../security/openssl/buildlink3.mk" 228.include "../../security/openssl/buildlink3.mk"
226.include "../../mk/dlopen.buildlink3.mk" 229.include "../../mk/dlopen.buildlink3.mk"
227# Required to detect X11BASE paths in dlopen(3) calls of _ctypes.so 
228.include "../../mk/x11.buildlink3.mk" 
229.include "../../mk/bsd.pkg.mk" 230.include "../../mk/bsd.pkg.mk"