components/apr-util-1_5/patches/apu-config.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 20 Apr 2017 23:00:38 -0700
changeset 7923 5df54a6ef074
parent 6000 3b823561a81d
permissions -rw-r--r--
Added tag s12-123 for changeset 69b30f58131b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6000
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
Patch origin: in-house
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
Patch status: Solaris-specific; not suitable for upstream
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
APR-util is installed in nonstandard path. -R is required.
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
--- apu-config.in
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
+++ apu-config.in
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
@@ -166,7 +166,7 @@
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
     --link-ld)
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
     if test "$location" = "installed"; then
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
         ### avoid using -L if libdir is a "standard" location like /usr/lib
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
-        flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
+        flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
     else
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
         flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
3b823561a81d 15605846 SUNBT6904332 [nvb127] missing -R linking flag in the apr and apu config files
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
     fi