summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr/apr-util
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/apr/apr-util
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-support/apr/apr-util')
-rw-r--r--meta/recipes-support/apr/apr-util/configfix.patch51
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch31
-rw-r--r--meta/recipes-support/apr/apr-util/run-ptest6
3 files changed, 88 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..dbb1148809
--- /dev/null
+++ b/meta/recipes-support/apr/apr-util/configfix.patch
@@ -0,0 +1,51 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: apr-util-1.3.4/apu-config.in
4===================================================================
5--- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000
6+++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000
7@@ -134,14 +134,7 @@
8 exit 0
9 ;;
10 --includes)
11- if test "$location" = "installed"; then
12 flags="$flags -I$includedir $INCLUDES"
13- elif test "$location" = "source"; then
14- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
15- else
16- # this is for VPATH builds
17- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES"
18- fi
19 ;;
20 --ldflags)
21 flags="$flags $LDFLAGS"
22@@ -155,28 +148,10 @@
23 exit 0
24 ;;
25 --link-ld)
26- if test "$location" = "installed"; then
27- ### avoid using -L if libdir is a "standard" location like /usr/lib
28 flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
29- else
30- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
31- fi
32 ;;
33 --link-libtool)
34- # If the LA_FILE exists where we think it should be, use it. If we're
35- # installed and the LA_FILE does not exist, assume to use -L/-l
36- # (the LA_FILE may not have been installed). If we're building ourselves,
37- # we'll assume that at some point the .la file be created.
38- if test -f "$LA_FILE"; then
39- flags="$flags $LA_FILE"
40- elif test "$location" = "installed"; then
41- ### avoid using -L if libdir is a "standard" location like /usr/lib
42- # Since the user is specifying they are linking with libtool, we
43- # *know* that -R will be recognized by libtool.
44- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
45- else
46- flags="$flags $LA_FILE"
47- fi
48+ flags="$flags -l$APRUTIL_LIBNAME"
49 ;;
50 --apu-la-file)
51 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..91e244ce2c
--- /dev/null
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: apr-util-1.4.1/configure.in
4===================================================================
5--- apr-util-1.4.1.orig/configure.in 2009-12-18 03:15:19.000000000 +0800
6+++ apr-util-1.4.1/configure.in 2011-12-30 13:32:07.000000000 +0800
7@@ -8,15 +8,15 @@
8 AC_CONFIG_HEADER(include/private/apu_config.h)
9 AC_CONFIG_AUX_DIR(build)
10
11-sinclude(build/apu-conf.m4)
12-sinclude(build/apu-iconv.m4)
13-sinclude(build/apu-hints.m4)
14-sinclude(build/apr_common.m4)
15-sinclude(build/find_apr.m4)
16-sinclude(build/crypto.m4)
17-sinclude(build/dbm.m4)
18-sinclude(build/dbd.m4)
19-sinclude(build/dso.m4)
20+#sinclude(build/apu-conf.m4)
21+#sinclude(build/apu-iconv.m4)
22+#sinclude(build/apu-hints.m4)
23+#sinclude(build/apr_common.m4)
24+#sinclude(build/find_apr.m4)
25+#sinclude(build/crypto.m4)
26+#sinclude(build/dbm.m4)
27+#sinclude(build/dbd.m4)
28+#sinclude(build/dso.m4)
29
30 dnl Generate ./config.nice for reproducing runs of configure
31 dnl
diff --git a/meta/recipes-support/apr/apr-util/run-ptest b/meta/recipes-support/apr/apr-util/run-ptest
new file mode 100644
index 0000000000..ae19a1d11b
--- /dev/null
+++ b/meta/recipes-support/apr/apr-util/run-ptest
@@ -0,0 +1,6 @@
1#!/bin/sh
2
3cd test
4./testall |sed \
5 -e 's|\(.*\): SUCCESS|PASS: \1|' \
6 -e 's|\(.*\): FAILED|FAIL: \1|'