mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-10 00:10:19 +03:00
7f8fe2b7fe
Bug: https://bugs.gentoo.org/870004 Bug: https://bugs.gentoo.org/875167 Bug: https://bugs.gentoo.org/893406 Closes: https://bugs.gentoo.org/811765 Signed-off-by: Sam James <sam@gentoo.org>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
https://bugs.gentoo.org/385775
|
|
|
|
utilize $SYSROOT to find the right includedir tree
|
|
|
|
drop the -L/-R paths since we know our libdir is the standard path which
|
|
the compiler already knows how to locate
|
|
--- a/apr-config.in
|
|
+++ b/apr-config.in
|
|
@@ -27,8 +27,8 @@ bindir="@bindir@"
|
|
libdir="@libdir@"
|
|
datarootdir="@datadir@"
|
|
datadir="@datadir@"
|
|
-installbuilddir="@installbuilddir@"
|
|
-includedir="@includedir@"
|
|
+installbuilddir="${SYSROOT}@installbuilddir@"
|
|
+includedir="${SYSROOT}@includedir@"
|
|
|
|
CC="@CC@"
|
|
CPP="@CPP@"
|
|
@@ -199,7 +199,7 @@ while test $# -gt 0; do
|
|
--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${APR_LIBNAME}"
|
|
elif test "$location" = "crosscompile"; then
|
|
flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
|
|
else
|
|
@@ -218,7 +218,7 @@ while test $# -gt 0; do
|
|
### avoid using -L if libdir is a "standard" location like /usr/lib
|
|
# Since the user is specifying they are linking with libtool, we
|
|
# *know* that -R will be recognized by libtool.
|
|
- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
|
|
+ flags="$flags -l${APR_LIBNAME}"
|
|
elif test "$location" = "crosscompile"; then
|
|
flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}"
|
|
else
|