15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 13 May 2016 06:50:48 -0700
changeset 6000 3b823561a81d
parent 5999 3b8cbeec276f
child 6001 bfad5cf58f0f
15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
components/apr-1_5/patches/apr-config.patch
components/apr-util-1_5/patches/apu-config.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/patches/apr-config.patch	Fri May 13 06:50:48 2016 -0700
@@ -0,0 +1,16 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+APR is installed in nonstandard path. -R is required.
+
+--- apr-config.in
++++ apr-config.in
[email protected]@ -183,7 +183,7 @@
+     --link-ld)
+     if test "$location" = "installed"; then
+         ### avoid using -L if libdir is a "standard" location like /usr/lib
+-        flags="$flags -L$libdir -l${APR_LIBNAME}"
++        flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
+     else
+         ### this surely can't work since the library is in .libs?
+         flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util-1_5/patches/apu-config.patch	Fri May 13 06:50:48 2016 -0700
@@ -0,0 +1,16 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+APR-util is installed in nonstandard path. -R is required.
+
+--- apu-config.in
++++ apu-config.in
[email protected]@ -166,7 +166,7 @@
+     --link-ld)
+     if test "$location" = "installed"; then
+         ### avoid using -L if libdir is a "standard" location like /usr/lib
+-        flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
++        flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
+     else
+         flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
+     fi