summaryrefslogtreecommitdiff
path: root/meta/packages/apr/apr-util
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/apr/apr-util')
-rw-r--r--meta/packages/apr/apr-util/configfix.patch49
-rw-r--r--meta/packages/apr/apr-util/configure_fixes.patch27
-rw-r--r--meta/packages/apr/apr-util/configure_fixes.patch.old25
3 files changed, 0 insertions, 101 deletions
diff --git a/meta/packages/apr/apr-util/configfix.patch b/meta/packages/apr/apr-util/configfix.patch
deleted file mode 100644
index a8953e524..000000000
--- a/meta/packages/apr/apr-util/configfix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: apr-util-1.3.4/apu-config.in
-===================================================================
---- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000
-+++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000
-@@ -134,14 +134,7 @@
- exit 0
- ;;
- --includes)
-- if test "$location" = "installed"; then
- flags="$flags -I$includedir $INCLUDES"
-- elif test "$location" = "source"; then
-- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
-- else
-- # this is for VPATH builds
-- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES"
-- fi
- ;;
- --ldflags)
- flags="$flags $LDFLAGS"
-@@ -155,28 +148,10 @@
- exit 0
- ;;
- --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"
-- else
-- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
-- fi
- ;;
- --link-libtool)
-- # If the LA_FILE exists where we think it should be, use it. If we're
-- # installed and the LA_FILE does not exist, assume to use -L/-l
-- # (the LA_FILE may not have been installed). If we're building ourselves,
-- # we'll assume that at some point the .la file be created.
-- if test -f "$LA_FILE"; then
-- flags="$flags $LA_FILE"
-- elif test "$location" = "installed"; then
-- ### avoid using -L if libdir is a "standard" location like /usr/lib
-- # Since the user is specifying they are linking with libtool, we
-- # *know* that -R will be recognized by libtool.
-- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
-- else
-- flags="$flags $LA_FILE"
-- fi
-+ flags="$flags -l$APRUTIL_LIBNAME"
- ;;
- --apu-la-file)
- if test -f "$LA_FILE"; then
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch b/meta/packages/apr/apr-util/configure_fixes.patch
deleted file mode 100644
index 0b2a0903e..000000000
--- a/meta/packages/apr/apr-util/configure_fixes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: apr-util-1.3.4/configure.in
-===================================================================
---- apr-util-1.3.4.orig/configure.in
-+++ apr-util-1.3.4/configure.in
-@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in)
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-
--sinclude(build/apu-conf.m4)
--sinclude(build/apu-iconv.m4)
--sinclude(build/apu-hints.m4)
--sinclude(build/apr_common.m4)
--sinclude(build/find_apr.m4)
--sinclude(build/dbm.m4)
--sinclude(build/dbd.m4)
--sinclude(build/dso.m4)
-+#sinclude(build/apu-conf.m4)
-+#sinclude(build/apu-iconv.m4)
-+#sinclude(build/apu-hints.m4)
-+#sinclude(build/apr_common.m4)
-+#sinclude(build/find_apr.m4)
-+#sinclude(build/dbm.m4)
-+#sinclude(build/dbd.m4)
-+#sinclude(build/dso.m4)
-
- dnl Generate ./config.nice for reproducing runs of configure
- dnl
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch.old b/meta/packages/apr/apr-util/configure_fixes.patch.old
deleted file mode 100644
index 16f88b3bb..000000000
--- a/meta/packages/apr/apr-util/configure_fixes.patch.old
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: apr-util-1.2.12/configure.in
-===================================================================
---- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
-+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
-@@ -8,13 +8,13 @@
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-
--sinclude(build/apu-conf.m4)
--sinclude(build/apu-iconv.m4)
--sinclude(build/apu-hints.m4)
--sinclude(build/apr_common.m4)
--sinclude(build/find_apr.m4)
--sinclude(build/dbm.m4)
--sinclude(build/dbd.m4)
-+#sinclude(build/apu-conf.m4)
-+#sinclude(build/apu-iconv.m4)
-+#sinclude(build/apu-hints.m4)
-+#sinclude(build/apr_common.m4)
-+#sinclude(build/find_apr.m4)
-+#sinclude(build/dbm.m4)
-+#sinclude(build/dbd.m4)
-
- dnl Generate ./config.nice for reproducing runs of configure
- dnl