mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-31 09:08:08 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
37 lines
1.2 KiB
Diff
37 lines
1.2 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/apu-config.in
|
|
+++ b/apu-config.in
|
|
@@ -25,7 +25,7 @@ prefix="@prefix@"
|
|
exec_prefix="@exec_prefix@"
|
|
bindir="@bindir@"
|
|
libdir="@libdir@"
|
|
-includedir="@includedir@"
|
|
+includedir="${SYSROOT}@includedir@"
|
|
|
|
LIBS="@APRUTIL_EXPORT_LIBS@"
|
|
INCLUDES="@APRUTIL_INCLUDES@"
|
|
@@ -166,7 +166,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$APRUTIL_LIBNAME"
|
|
+ flags="$flags -l$APRUTIL_LIBNAME"
|
|
else
|
|
flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
|
|
fi
|
|
@@ -182,7 +182,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$APRUTIL_LIBNAME"
|
|
+ flags="$flags -l$APRUTIL_LIBNAME"
|
|
else
|
|
flags="$flags $LA_FILE"
|
|
fi
|