diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-support/apr/apr/configfix.patch | |
parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
download | poky-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/configfix.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/configfix.patch | 51 |
1 files changed, 51 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..995555e8ba --- /dev/null +++ b/meta/recipes-support/apr/apr/configfix.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | Index: apr-1.3.3/apr-config.in | ||
2 | =================================================================== | ||
3 | --- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000 | ||
4 | +++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000 | ||
5 | @@ -152,14 +152,7 @@ | ||
6 | flags="$flags $LDFLAGS" | ||
7 | ;; | ||
8 | --includes) | ||
9 | - if test "$location" = "installed"; then | ||
10 | flags="$flags -I$includedir $EXTRA_INCLUDES" | ||
11 | - elif test "$location" = "source"; then | ||
12 | - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" | ||
13 | - else | ||
14 | - # this is for VPATH builds | ||
15 | - flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" | ||
16 | - fi | ||
17 | ;; | ||
18 | --srcdir) | ||
19 | echo $APR_SOURCE_DIR | ||
20 | @@ -181,29 +167,14 @@ | ||
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${APR_LIBNAME}" | ||
27 | - else | ||
28 | - ### this surely can't work since the library is in .libs? | ||
29 | - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" | ||
30 | - fi | ||
31 | + flags="$flags -l${APR_LIBNAME}" | ||
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${APR_LIBNAME}" | ||
45 | - else | ||
46 | - flags="$flags $LA_FILE" | ||
47 | - fi | ||
48 | + flags="$flags -l${APR_LIBNAME}" | ||
49 | ;; | ||
50 | --shlib-path-var) | ||
51 | echo "$SHLIBPATH_VAR" | ||