diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/apr/apr-util/configfix.patch | |
download | poky-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/configfix.patch')
-rw-r--r-- | meta/recipes-support/apr/apr-util/configfix.patch | 51 |
1 files changed, 51 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 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: 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 | ||