summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich2011-05-05 14:40:50 +0000
committerJo-Philipp Wich2011-05-05 14:40:50 +0000
commit486c2aace35934f8d9a274ec3e268bf346572772 (patch)
treeb8f688e2ebb287ba6f36c51ce87f226b1df9f538
parentc0cb44297cb5756a71396d949dddfdc913574ad6 (diff)
downloadarchive-486c2aace35934f8d9a274ec3e268bf346572772.tar.gz
[packages] apr: ditch shipped libtool, make it non-silent
SVN-Revision: 26831
-rw-r--r--libs/apr/Makefile3
-rw-r--r--libs/apr/patches/001-autoconf-compat.patch12
2 files changed, 14 insertions, 1 deletions
diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 94bfd995d8..4a0b704762 100644
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -15,7 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr
PKG_MD5SUM:=4b00e8f70c067893d075577962656b35
-PKG_FIXUP:=libtool
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
PKG_INSTALL:=1
diff --git a/libs/apr/patches/001-autoconf-compat.patch b/libs/apr/patches/001-autoconf-compat.patch
index 0f383eb480..88f71fd6b8 100644
--- a/libs/apr/patches/001-autoconf-compat.patch
+++ b/libs/apr/patches/001-autoconf-compat.patch
@@ -8,3 +8,15 @@
#
# APR (Apache Portable Runtime) library Makefile.
+--- a/configure.in
++++ b/configure.in
+@@ -180,9 +180,6 @@ case $host in
+ gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c
+ ;;
+ *)
+- if test "x$LTFLAGS" = "x"; then
+- LTFLAGS='--silent'
+- fi
+ if test "$experimental_libtool" = "yes"; then
+ # Use a custom-made libtool replacement
+ echo "using jlibtool"