diff options
Diffstat (limited to 'meta/recipes-support/apr/apr/configfix.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/configfix.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/configfix.patch b/meta/recipes-support/apr/apr/configfix.patch new file mode 100644 index 0000000000..605c4f632c --- /dev/null +++ b/meta/recipes-support/apr/apr/configfix.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: apr-1.3.3/apr-config.in | ||
4 | =================================================================== | ||
5 | --- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000 | ||
6 | +++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000 | ||
7 | @@ -152,14 +152,7 @@ | ||
8 | flags="$flags $LDFLAGS" | ||
9 | ;; | ||
10 | --includes) | ||
11 | - if test "$location" = "installed"; then | ||
12 | flags="$flags -I$includedir $EXTRA_INCLUDES" | ||
13 | - elif test "$location" = "source"; then | ||
14 | - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" | ||
15 | - else | ||
16 | - # this is for VPATH builds | ||
17 | - flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" | ||
18 | - fi | ||
19 | ;; | ||
20 | --srcdir) | ||
21 | echo $APR_SOURCE_DIR | ||
22 | @@ -181,29 +167,14 @@ | ||
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${APR_LIBNAME}" | ||
29 | - else | ||
30 | - ### this surely can't work since the library is in .libs? | ||
31 | - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" | ||
32 | - fi | ||
33 | + flags="$flags -l${APR_LIBNAME}" | ||
34 | ;; | ||
35 | --link-libtool) | ||
36 | # If the LA_FILE exists where we think it should be, use it. If we're | ||
37 | # installed and the LA_FILE does not exist, assume to use -L/-l | ||
38 | # (the LA_FILE may not have been installed). If we're building ourselves, | ||
39 | # we'll assume that at some point the .la file be created. | ||
40 | - if test -f "$LA_FILE"; then | ||
41 | - flags="$flags $LA_FILE" | ||
42 | - elif test "$location" = "installed"; then | ||
43 | - ### avoid using -L if libdir is a "standard" location like /usr/lib | ||
44 | - # Since the user is specifying they are linking with libtool, we | ||
45 | - # *know* that -R will be recognized by libtool. | ||
46 | - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" | ||
47 | - else | ||
48 | - flags="$flags $LA_FILE" | ||
49 | - fi | ||
50 | + flags="$flags -l${APR_LIBNAME}" | ||
51 | ;; | ||
52 | --shlib-path-var) | ||
53 | echo "$SHLIBPATH_VAR" | ||