diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-03 19:58:43 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-08 16:20:40 +0200 |
| commit | afc98c7dea0397888eef03a220c230b798b2d448 (patch) | |
| tree | 16fcb0b3c397f1c0135dc3255e4c64766cd62938 /patches/apr-util-0.9.19 | |
| parent | 7187ee3b1b0927a2436f546b69960af436ceea42 (diff) | |
| download | ptxdist-afc98c7dea0397888eef03a220c230b798b2d448.tar.gz ptxdist-afc98c7dea0397888eef03a220c230b798b2d448.tar.xz | |
apr-util: add Apache's Portable Runtime Library Utils
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/apr-util-0.9.19')
3 files changed, 82 insertions, 0 deletions
diff --git a/patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch b/patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch new file mode 100644 index 000000000..025f7a27a --- /dev/null +++ b/patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch @@ -0,0 +1,58 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Thu, 26 Apr 2012 13:03:39 +0200 +Subject: [PATCH] apu-config: add SYSROOT + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + apu-config.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/apu-config.in b/apu-config.in +index f05360c..3d669e7 100644 +--- a/apu-config.in ++++ b/apu-config.in +@@ -78,7 +78,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"` +@@ -114,7 +114,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 +@@ -126,7 +126,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 +@@ -148,7 +148,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 +@@ -162,7 +162,7 @@ while test $# -gt 0; do + flags="$flags $LA_FILE" + elif 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 $LA_FILE" + fi diff --git a/patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch b/patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch new file mode 100644 index 000000000..a25da074f --- /dev/null +++ b/patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch @@ -0,0 +1,19 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Thu, 26 Apr 2012 09:50:17 +0200 +Subject: [PATCH] HACK: uri/Makefile: fallback to gen_uri_delims from $PATH + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + uri/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/uri/Makefile.in b/uri/Makefile.in +index 37d2f06..cac644e 100644 +--- a/uri/Makefile.in ++++ b/uri/Makefile.in +@@ -15,4 +15,4 @@ gen_uri_delims: $(gen_uri_delims_OBJECTS) + apr_uri.lo: uri_delims.h apr_uri.c + + uri_delims.h: gen_uri_delims +- ./gen_uri_delims > uri_delims.h ++ ./gen_uri_delims > uri_delims.h || gen_uri_delims > uri_delims.h diff --git a/patches/apr-util-0.9.19/series b/patches/apr-util-0.9.19/series new file mode 100644 index 000000000..d024277bd --- /dev/null +++ b/patches/apr-util-0.9.19/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-apu-config-add-SYSROOT.patch +0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch +# b515dde9e38a53e6df537b9e537b48e5 - git-ptx-patches magic |