From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YNMDT-0006vb-4B for ptxdist@pengutronix.de; Mon, 16 Feb 2015 15:00:04 +0100 Received: by mail-we0-f174.google.com with SMTP id w55so29434682wes.5 for ; Mon, 16 Feb 2015 05:59:57 -0800 (PST) From: Oliver Graute Date: Mon, 16 Feb 2015 14:59:45 +0100 Message-Id: <1424095185-30347-3-git-send-email-oliver.graute@neuhaus.de> In-Reply-To: <1424095185-30347-1-git-send-email-oliver.graute@neuhaus.de> References: <1424095185-30347-1-git-send-email-oliver.graute@neuhaus.de> Subject: [ptxdist] [PATCH 3/3] added apu-config-add-SYSROOT.patch Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Oliver Graute Signed-off-by: Oliver Graute --- .../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