| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Fri, 13 May 2016 06:50:48 -0700 | |
| changeset 6000 | 3b823561a81d |
| permissions | -rw-r--r-- |
|
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 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 |
--- apr-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 |
+++ apr-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 |
@@ -183,7 +183,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${APR_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${APR_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 |
### this surely can't work since the library is in .libs? |
|
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 |
flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
|