On 25.07.2016 09:55, Andreas Kusalananda Kähäri wrote: > On Mon, Jul 25, 2016 at 02:07:52AM +0200, Kamil Rytarowski wrote: >> On 24.07.2016 20:46, Amitai Schlair wrote: >>> On 23 Jul 2016, at 17:12, Kamil Rytarowski wrote: >>> >>>> On 23.07.2016 22:45, Thomas Klausner wrote: >>>>> On Sat, Jul 23, 2016 at 06:28:26PM +0000, Kamil Rytarowski wrote: >>>>>> @@ -218,4 +224,6 @@ BUILDLINK_DEPMETHOD.readline= build >>>>>> .include "../../devel/zlib/buildlink3.mk" >>>>>> .include "../../security/openssl/buildlink3.mk" >>>>>> .include "../../mk/dlopen.buildlink3.mk" >>>>>> +# Required to detect X11BASE paths in dlopen(3) calls of _ctypes.so >>>>>> +.include "../../mk/x11.buildlink3.mk" >>>>>> .include "../../mk/bsd.pkg.mk" >>>>> >>>>> This breaks the build with X11_TYPE=modular: >>>>> >>>>> Do not include x11.buildlink3.mk for X11_TYPE != "native" >>>> >>>> Should be fine now. Thank you! >>> >>> This (and maybe previous as well) breaks the build on a system without >>> X11. Can we declare an "x11" option for lang/python27 and only apply the >>> intended fix when PKG_OPTIONS.x11 is enabled? >>> >>> Thanks, >>> >>> - Amitai >> >> Please review this patch: >> >> http://netbsd.org/~kamil/patch-00004-python27-x11native.txt >> > > With no X11_TYPE set (I don't use X11, and I don't want to), "bmake > package" fails with > > ERROR: This package has set PKG_FAIL_REASON: > ERROR: python27-2.7.12nb3 uses X11, but /opt/X11 not found > *** Error code 1 > > Stop. > bmake: stopped in /Users/kk/pkgsrc/lang/python27 > > > > Setting X11_TYPE to a nonsensical value ("none") makes the build fail > for libtool-base instead: > > ===> Installing dependencies for libtool-base-2.4.2nb13 > => Tool dependency nbpatch-[0-9]*: found nbpatch-20151107 > bmake[3]: "../../mk/buildlink3/../../mk/buildlink3/bsd.buildlink3.mk" > line 690: Malformed conditional (${X11_TYPE} != "modular" && ${X11BASE} > != "/usr") > bmake[3]: "../../mk/buildlink3/../../mk/buildlink3/bsd.buildlink3.mk" > line 723: Malformed conditional (${X11_TYPE} != "modular" && ${X11BASE} > != "/usr") > bmake[3]: Fatal errors encountered -- cannot continue > bmake[3]: stopped in /Users/kk/pkgsrc/devel/libtool-base > bmake[3]: "../../mk/buildlink3/../../mk/buildlink3/bsd.buildlink3.mk" > line 690: Malformed conditional (${X11_TYPE} != "modular" && ${X11BASE} > != "/usr") > bmake[3]: "../../mk/buildlink3/../../mk/buildlink3/bsd.buildlink3.mk" > line 723: Malformed conditional (${X11_TYPE} != "modular" && ${X11BASE} > != "/usr") > bmake[3]: Fatal errors encountered -- cannot continue > bmake[3]: stopped in /Users/kk/pkgsrc/devel/libtool-base > > > > > Please try this patch: http://netbsd.org/~kamil/patch-00004-python27-x11native-2.txt
Attachment:
signature.asc
Description: OpenPGP digital signature