summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-03-01 12:12:01 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-03-01 13:58:02 +0100
commitd7d15730d6d54d481dbe8494a1f6d34ce2ce42b9 (patch)
tree1413e32319a4ea55835aa4e26ece1977206ba185 /patches
parent6da485b4940906d50b48da7e6e26e84629cdf142 (diff)
downloadptxdist-d7d15730d6d54d481dbe8494a1f6d34ce2ce42b9.tar.gz
ptxdist-d7d15730d6d54d481dbe8494a1f6d34ce2ce42b9.tar.xz
apr-util: remove after on year in staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch58
-rw-r--r--patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch19
-rw-r--r--patches/apr-util-0.9.19/series5
3 files changed, 0 insertions, 82 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
deleted file mode 100644
index 025f7a27a..000000000
--- a/patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index a25da074f..000000000
--- a/patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index d024277bd..000000000
--- a/patches/apr-util-0.9.19/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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