summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr/apr-util
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:11 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:57 +0100
commitd62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch)
treef36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-support/apr/apr-util
parentcaab7fc509bf27706ff3248689f6afd04225cfda (diff)
downloadpoky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/apr/apr-util')
-rw-r--r--meta/recipes-support/apr/apr-util/configfix.patch49
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch27
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch.old25
3 files changed, 101 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr-util/configfix.patch b/meta/recipes-support/apr/apr-util/configfix.patch
new file mode 100644
index 0000000000..a8953e5244
--- /dev/null
+++ b/meta/recipes-support/apr/apr-util/configfix.patch
@@ -0,0 +1,49 @@
1Index: apr-util-1.3.4/apu-config.in
2===================================================================
3--- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000
4+++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000
5@@ -134,14 +134,7 @@
6 exit 0
7 ;;
8 --includes)
9- if test "$location" = "installed"; then
10 flags="$flags -I$includedir $INCLUDES"
11- elif test "$location" = "source"; then
12- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
13- else
14- # this is for VPATH builds
15- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES"
16- fi
17 ;;
18 --ldflags)
19 flags="$flags $LDFLAGS"
20@@ -155,28 +148,10 @@
21 exit 0
22 ;;
23 --link-ld)
24- if test "$location" = "installed"; then
25- ### avoid using -L if libdir is a "standard" location like /usr/lib
26 flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
27- else
28- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
29- fi
30 ;;
31 --link-libtool)
32- # If the LA_FILE exists where we think it should be, use it. If we're
33- # installed and the LA_FILE does not exist, assume to use -L/-l
34- # (the LA_FILE may not have been installed). If we're building ourselves,
35- # we'll assume that at some point the .la file be created.
36- if test -f "$LA_FILE"; then
37- flags="$flags $LA_FILE"
38- elif test "$location" = "installed"; then
39- ### avoid using -L if libdir is a "standard" location like /usr/lib
40- # Since the user is specifying they are linking with libtool, we
41- # *know* that -R will be recognized by libtool.
42- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
43- else
44- flags="$flags $LA_FILE"
45- fi
46+ flags="$flags -l$APRUTIL_LIBNAME"
47 ;;
48 --apu-la-file)
49 if test -f "$LA_FILE"; then
diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch
new file mode 100644
index 0000000000..0b2a0903e1
--- /dev/null
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch
@@ -0,0 +1,27 @@
1Index: apr-util-1.3.4/configure.in
2===================================================================
3--- apr-util-1.3.4.orig/configure.in
4+++ apr-util-1.3.4/configure.in
5@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in)
6 AC_CONFIG_HEADER(include/private/apu_config.h)
7 AC_CONFIG_AUX_DIR(build)
8
9-sinclude(build/apu-conf.m4)
10-sinclude(build/apu-iconv.m4)
11-sinclude(build/apu-hints.m4)
12-sinclude(build/apr_common.m4)
13-sinclude(build/find_apr.m4)
14-sinclude(build/dbm.m4)
15-sinclude(build/dbd.m4)
16-sinclude(build/dso.m4)
17+#sinclude(build/apu-conf.m4)
18+#sinclude(build/apu-iconv.m4)
19+#sinclude(build/apu-hints.m4)
20+#sinclude(build/apr_common.m4)
21+#sinclude(build/find_apr.m4)
22+#sinclude(build/dbm.m4)
23+#sinclude(build/dbd.m4)
24+#sinclude(build/dso.m4)
25
26 dnl Generate ./config.nice for reproducing runs of configure
27 dnl
diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch.old b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
new file mode 100644
index 0000000000..16f88b3bba
--- /dev/null
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
@@ -0,0 +1,25 @@
1Index: apr-util-1.2.12/configure.in
2===================================================================
3--- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
4+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
5@@ -8,13 +8,13 @@
6 AC_CONFIG_HEADER(include/private/apu_config.h)
7 AC_CONFIG_AUX_DIR(build)
8
9-sinclude(build/apu-conf.m4)
10-sinclude(build/apu-iconv.m4)
11-sinclude(build/apu-hints.m4)
12-sinclude(build/apr_common.m4)
13-sinclude(build/find_apr.m4)
14-sinclude(build/dbm.m4)
15-sinclude(build/dbd.m4)
16+#sinclude(build/apu-conf.m4)
17+#sinclude(build/apu-iconv.m4)
18+#sinclude(build/apu-hints.m4)
19+#sinclude(build/apr_common.m4)
20+#sinclude(build/find_apr.m4)
21+#sinclude(build/dbm.m4)
22+#sinclude(build/dbd.m4)
23
24 dnl Generate ./config.nice for reproducing runs of configure
25 dnl