Mon May 30 19:52:49 2016 UTC ()
Apply band-aid for PR pkg/51172 openssl rpath problem.

I tried and failed to reverse engineer the build framework to add
the rpath in the right place.
Give up for now and force it with WRAP_EXTRA_ARGS.CXX.
At least it makes the package build again.


(tnn)
diff -r1.8 -r1.9 pkgsrc/lang/nodejs/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/lang/nodejs/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/options.mk 2016/04/01 08:21:05 1.8
+++ pkgsrc/lang/nodejs/options.mk 2016/05/30 19:52:49 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.8 2016/04/01 08:21:05 fhajny Exp $ 1# $NetBSD: options.mk,v 1.9 2016/05/30 19:52:49 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.node 3PKG_OPTIONS_VAR= PKG_OPTIONS.node
4PKG_SUPPORTED_OPTIONS= openssl dtrace icu 4PKG_SUPPORTED_OPTIONS= openssl dtrace icu
5PKG_SUGGESTED_OPTIONS= openssl 5PKG_SUGGESTED_OPTIONS= openssl
6 6
7.if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") \ 7.if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") \
8 && exists(/usr/sbin/dtrace) 8 && exists(/usr/sbin/dtrace)
9PKG_SUGGESTED_OPTIONS+= dtrace 9PKG_SUGGESTED_OPTIONS+= dtrace
10.endif 10.endif
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14PLIST_VARS+= dtrace 14PLIST_VARS+= dtrace
@@ -22,16 +22,18 @@ CONFIGURE_ARGS+= --without-dtrace @@ -22,16 +22,18 @@ CONFIGURE_ARGS+= --without-dtrace
22 22
23# print-PLIST helper 23# print-PLIST helper
24PRINT_PLIST_AWK+= {if ($$0 ~ /lib\/dtrace/) {$$0 = "$${PLIST.dtrace}" $$0;}} 24PRINT_PLIST_AWK+= {if ($$0 ~ /lib\/dtrace/) {$$0 = "$${PLIST.dtrace}" $$0;}}
25 25
26.if !empty(PKG_OPTIONS:Micu) 26.if !empty(PKG_OPTIONS:Micu)
27CONFIGURE_ARGS+= --with-intl=system-icu 27CONFIGURE_ARGS+= --with-intl=system-icu
28.include "../../textproc/icu/buildlink3.mk" 28.include "../../textproc/icu/buildlink3.mk"
29.endif 29.endif
30 30
31.if !empty(PKG_OPTIONS:Mopenssl) 31.if !empty(PKG_OPTIONS:Mopenssl)
32BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.2 32BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.2
33.include "../../security/openssl/buildlink3.mk" 33.include "../../security/openssl/buildlink3.mk"
34CONFIGURE_ARGS+= --shared-openssl 34CONFIGURE_ARGS+= --shared-openssl
 35_WRAP_EXTRA_ARGS.CXX+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 36CWRAPPERS_APPEND.cxx+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
35.else 37.else
36CONFIGURE_ARGS+= --without-ssl 38CONFIGURE_ARGS+= --without-ssl
37.endif 39.endif