From 0158b90ff5833c420b59064dac437a7348e7d931 Mon Sep 17 00:00:00 2001 From: kamil Date: Tue, 21 Jan 2020 10:57:26 +0000 Subject: python*: Switch to USE_X11=weak --- lang/python27/options.mk | 4 ++-- lang/python36/options.mk | 4 ++-- lang/python37/options.mk | 4 ++-- lang/python38/options.mk | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lang/python27/options.mk b/lang/python27/options.mk index b1493732107..f1981a3c304 100644 --- a/lang/python27/options.mk +++ b/lang/python27/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2019/03/03 10:44:41 adam Exp $ +# $NetBSD: options.mk,v 1.3 2020/01/21 10:57:26 kamil Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.python27 PKG_SUPPORTED_OPTIONS+= x11 @@ -18,7 +18,7 @@ SUBST_SED.xfindlib= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${X11BASE}/lib -L$ # Required to get definition of X11BASE and retain X11 rpath paths for linker # We need to pass rpath to _ctypes.so to get functional dlopen(3) for X11 libs -USE_X11= yes +USE_X11= weak SUBST_CLASSES+= cdlopen SUBST_MESSAGE.cdlopen= Handle X11BASE paths in dlopen(3) calls of _ctypes.so diff --git a/lang/python36/options.mk b/lang/python36/options.mk index e44fc999346..44376d283eb 100644 --- a/lang/python36/options.mk +++ b/lang/python36/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2019/10/15 16:52:41 adam Exp $ +# $NetBSD: options.mk,v 1.5 2020/01/21 10:57:26 kamil Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.python36 PKG_SUPPORTED_OPTIONS= dtrace pymalloc x11 @@ -25,7 +25,7 @@ SUBST_SED.xfindlib= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${X11BASE}/lib', ' # Required to get definition of X11BASE and retain X11 rpath paths for linker # We need to pass rpath to _ctypes.so to get functional dlopen(3) for X11 libs -USE_X11= yes +USE_X11= weak SUBST_CLASSES+= cdlopen SUBST_MESSAGE.cdlopen= Handle X11BASE paths in dlopen(3) calls of _ctypes.so diff --git a/lang/python37/options.mk b/lang/python37/options.mk index 6be506ad743..2da15b5ed95 100644 --- a/lang/python37/options.mk +++ b/lang/python37/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2019/10/15 16:55:00 adam Exp $ +# $NetBSD: options.mk,v 1.5 2020/01/21 10:57:26 kamil Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.python37 PKG_SUPPORTED_OPTIONS= dtrace pymalloc x11 @@ -25,7 +25,7 @@ SUBST_SED.xfindlib= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${X11BASE}/lib', ' # Required to get definition of X11BASE and retain X11 rpath paths for linker # We need to pass rpath to _ctypes.so to get functional dlopen(3) for X11 libs -USE_X11= yes +USE_X11= weak SUBST_CLASSES+= cdlopen SUBST_MESSAGE.cdlopen= Handle X11BASE paths in dlopen(3) calls of _ctypes.so diff --git a/lang/python38/options.mk b/lang/python38/options.mk index a7336162f82..1e2e5ec861a 100644 --- a/lang/python38/options.mk +++ b/lang/python38/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2019/10/15 16:50:11 adam Exp $ +# $NetBSD: options.mk,v 1.2 2020/01/21 10:57:26 kamil Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.python38 PKG_SUPPORTED_OPTIONS= dtrace pymalloc x11 @@ -25,7 +25,7 @@ SUBST_SED.xfindlib= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${X11BASE}/lib', ' # Required to get definition of X11BASE and retain X11 rpath paths for linker # We need to pass rpath to _ctypes.so to get functional dlopen(3) for X11 libs -USE_X11= yes +USE_X11= weak SUBST_CLASSES+= cdlopen SUBST_MESSAGE.cdlopen= Handle X11BASE paths in dlopen(3) calls of _ctypes.so -- cgit v1.2.3