[ptxdist] [PATCH 2/2] added 0001-apu-config-add-SYSROOT.patch

[Oliver Graute <oliver.graute@gmail.com>]

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 .../0001-apu-config-add-SYSROOT.patch              |   39 ++++++++++++++++++++
 patches/apr-util-1.5.4/series                      |    1 +
 2 files changed, 40 insertions(+)
 create mode 100644 patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch
 create mode 100644 patches/apr-util-1.5.4/series

diff --git a/patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch b/patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch
new file mode 100644
index 0000000..d8a594c
--- /dev/null
+++ b/patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch
@@ -0,0 +1,39 @@
+diff -rupN AM/apu-config.in AN/apu-config.in
+--- AM/apu-config.in	2010-09-29 16:21:25.000000000 +0200
++++ AN/apu-config.in	2015-02-13 12:58:30.942178404 +0100
+@@ -84,7 +84,7 @@ if test $# -eq 0; then
+ fi
+ 
+ if test "$location" = "installed"; then
+-    LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la"
++    LA_FILE="${SYSROOT}$libdir/lib${APRUTIL_LIBNAME}.la"
+ 
+     LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/libexpat.la -lexpat g"`
+     LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"`
+@@ -132,7 +132,7 @@ while test $# -gt 0; do
+     ;;
+     --includedir)
+     if test "$location" = "installed"; then
+-        flags="$includedir"
++        flags="${SYSROOT}$includedir"
+     elif test "$location" = "source"; then
+         flags="$APU_SOURCE_DIR/include"
+     else
+@@ -144,7 +144,7 @@ while test $# -gt 0; do
+     ;;
+     --includes)
+     if test "$location" = "installed"; then
+-        flags="$flags -I$includedir $INCLUDES"
++        flags="$flags -I${SYSROOT}$includedir $INCLUDES"
+     elif test "$location" = "source"; then
+         flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
+     else
+@@ -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${SYSROOT}$libdir -l$APRUTIL_LIBNAME"
+     else
+         flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
+     fi
diff --git a/patches/apr-util-1.5.4/series b/patches/apr-util-1.5.4/series
new file mode 100644
index 0000000..4773caa
--- /dev/null
+++ b/patches/apr-util-1.5.4/series
@@ -0,0 +1 @@
+0001-apu-config-add-SYSROOT.patch
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de