summaryrefslogtreecommitdiff
path: root/meta/packages/apr/apr-util
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-12 17:34:52 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-12 17:34:52 +0000
commitf51973f5afb4775252bdf26827ba44663e1dda2d (patch)
tree9f8754f9259a0ffbdc3994f44259d36eaaf917be /meta/packages/apr/apr-util
parenta43863b7f126b4e4e9eae64c11b657ef9530e50a (diff)
downloadopenembedded-core-f51973f5afb4775252bdf26827ba44663e1dda2d.tar.gz
openembedded-core-f51973f5afb4775252bdf26827ba44663e1dda2d.tar.bz2
openembedded-core-f51973f5afb4775252bdf26827ba44663e1dda2d.tar.xz
openembedded-core-f51973f5afb4775252bdf26827ba44663e1dda2d.zip
apr/apr-util: Fix some other config path gremlins breaking builds
Diffstat (limited to 'meta/packages/apr/apr-util')
-rw-r--r--meta/packages/apr/apr-util/configfix.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/packages/apr/apr-util/configfix.patch b/meta/packages/apr/apr-util/configfix.patch
new file mode 100644
index 000000000..a8953e524
--- /dev/null
+++ b/meta/packages/apr/apr-util/configfix.patch
@@ -0,0 +1,49 @@
+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