diff options
Diffstat (limited to 'meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch new file mode 100644 index 0000000000..72e706f966 --- /dev/null +++ b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 30 Jan 2018 09:39:06 +0800 | ||
4 | Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr | ||
5 | files | ||
6 | |||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
10 | |||
11 | The generated `apr-1-config' is used by other recipes at build time or | ||
12 | packages at target run time, the workdir path caused confusion. | ||
13 | |||
14 | Rebase to 1.6.3 | ||
15 | |||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | --- | ||
18 | apr-config.in | 26 ++------------------------ | ||
19 | 1 file changed, 2 insertions(+), 24 deletions(-) | ||
20 | |||
21 | diff --git a/apr-config.in b/apr-config.in | ||
22 | index 84b4073..bbbf651 100644 | ||
23 | --- a/apr-config.in | ||
24 | +++ b/apr-config.in | ||
25 | @@ -152,14 +152,7 @@ while test $# -gt 0; do | ||
26 | flags="$flags $LDFLAGS" | ||
27 | ;; | ||
28 | --includes) | ||
29 | - if test "$location" = "installed"; then | ||
30 | flags="$flags -I$includedir $EXTRA_INCLUDES" | ||
31 | - elif test "$location" = "source"; then | ||
32 | - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" | ||
33 | - else | ||
34 | - # this is for VPATH builds | ||
35 | - flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" | ||
36 | - fi | ||
37 | ;; | ||
38 | --srcdir) | ||
39 | echo $APR_SOURCE_DIR | ||
40 | @@ -181,29 +174,14 @@ while test $# -gt 0; do | ||
41 | exit 0 | ||
42 | ;; | ||
43 | --link-ld) | ||
44 | - if test "$location" = "installed"; then | ||
45 | - ### avoid using -L if libdir is a "standard" location like /usr/lib | ||
46 | - flags="$flags -L$libdir -l${APR_LIBNAME}" | ||
47 | - else | ||
48 | - ### this surely can't work since the library is in .libs? | ||
49 | - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" | ||
50 | - fi | ||
51 | + flags="$flags -l${APR_LIBNAME}" | ||
52 | ;; | ||
53 | --link-libtool) | ||
54 | # If the LA_FILE exists where we think it should be, use it. If we're | ||
55 | # installed and the LA_FILE does not exist, assume to use -L/-l | ||
56 | # (the LA_FILE may not have been installed). If we're building ourselves, | ||
57 | # we'll assume that at some point the .la file be created. | ||
58 | - if test -f "$LA_FILE"; then | ||
59 | - flags="$flags $LA_FILE" | ||
60 | - elif test "$location" = "installed"; then | ||
61 | - ### avoid using -L if libdir is a "standard" location like /usr/lib | ||
62 | - # Since the user is specifying they are linking with libtool, we | ||
63 | - # *know* that -R will be recognized by libtool. | ||
64 | - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" | ||
65 | - else | ||
66 | - flags="$flags $LA_FILE" | ||
67 | - fi | ||
68 | + flags="$flags -l${APR_LIBNAME}" | ||
69 | ;; | ||
70 | --shlib-path-var) | ||
71 | echo "$SHLIBPATH_VAR" | ||
72 | -- | ||
73 | 1.8.3.1 | ||
74 | |||