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 | 25 |
1 files changed, 14 insertions, 11 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 index 72e706f966..d63423f3a1 100644 --- 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 | |||
@@ -1,8 +1,7 @@ | |||
1 | From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001 | 1 | From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 30 Jan 2018 09:39:06 +0800 | 3 | Date: Tue, 30 Jan 2018 09:39:06 +0800 |
4 | Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr | 4 | Subject: [PATCH] apr: Remove workdir path references from installed apr files |
5 | files | ||
6 | 5 | ||
7 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
8 | 7 | ||
@@ -14,20 +13,23 @@ packages at target run time, the workdir path caused confusion. | |||
14 | Rebase to 1.6.3 | 13 | Rebase to 1.6.3 |
15 | 14 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
16 | |||
17 | --- | 17 | --- |
18 | apr-config.in | 26 ++------------------------ | 18 | apr-config.in | 32 ++------------------------------ |
19 | 1 file changed, 2 insertions(+), 24 deletions(-) | 19 | 1 file changed, 2 insertions(+), 30 deletions(-) |
20 | 20 | ||
21 | diff --git a/apr-config.in b/apr-config.in | 21 | diff --git a/apr-config.in b/apr-config.in |
22 | index 84b4073..bbbf651 100644 | 22 | index bed47ca..47874e5 100644 |
23 | --- a/apr-config.in | 23 | --- a/apr-config.in |
24 | +++ b/apr-config.in | 24 | +++ b/apr-config.in |
25 | @@ -152,14 +152,7 @@ while test $# -gt 0; do | 25 | @@ -164,16 +164,7 @@ while test $# -gt 0; do |
26 | flags="$flags $LDFLAGS" | 26 | flags="$flags $LDFLAGS" |
27 | ;; | 27 | ;; |
28 | --includes) | 28 | --includes) |
29 | - if test "$location" = "installed"; then | 29 | - if test "$location" = "installed"; then |
30 | flags="$flags -I$includedir $EXTRA_INCLUDES" | 30 | flags="$flags -I$includedir $EXTRA_INCLUDES" |
31 | - elif test "$location" = "crosscompile"; then | ||
32 | - flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" | ||
31 | - elif test "$location" = "source"; then | 33 | - elif test "$location" = "source"; then |
32 | - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" | 34 | - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" |
33 | - else | 35 | - else |
@@ -37,13 +39,15 @@ index 84b4073..bbbf651 100644 | |||
37 | ;; | 39 | ;; |
38 | --srcdir) | 40 | --srcdir) |
39 | echo $APR_SOURCE_DIR | 41 | echo $APR_SOURCE_DIR |
40 | @@ -181,29 +174,14 @@ while test $# -gt 0; do | 42 | @@ -197,33 +188,14 @@ while test $# -gt 0; do |
41 | exit 0 | 43 | exit 0 |
42 | ;; | 44 | ;; |
43 | --link-ld) | 45 | --link-ld) |
44 | - if test "$location" = "installed"; then | 46 | - if test "$location" = "installed"; then |
45 | - ### avoid using -L if libdir is a "standard" location like /usr/lib | 47 | - ### avoid using -L if libdir is a "standard" location like /usr/lib |
46 | - flags="$flags -L$libdir -l${APR_LIBNAME}" | 48 | - flags="$flags -L$libdir -l${APR_LIBNAME}" |
49 | - elif test "$location" = "crosscompile"; then | ||
50 | - flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" | ||
47 | - else | 51 | - else |
48 | - ### this surely can't work since the library is in .libs? | 52 | - ### this surely can't work since the library is in .libs? |
49 | - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" | 53 | - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" |
@@ -62,6 +66,8 @@ index 84b4073..bbbf651 100644 | |||
62 | - # Since the user is specifying they are linking with libtool, we | 66 | - # Since the user is specifying they are linking with libtool, we |
63 | - # *know* that -R will be recognized by libtool. | 67 | - # *know* that -R will be recognized by libtool. |
64 | - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" | 68 | - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" |
69 | - elif test "$location" = "crosscompile"; then | ||
70 | - flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" | ||
65 | - else | 71 | - else |
66 | - flags="$flags $LA_FILE" | 72 | - flags="$flags $LA_FILE" |
67 | - fi | 73 | - fi |
@@ -69,6 +75,3 @@ index 84b4073..bbbf651 100644 | |||
69 | ;; | 75 | ;; |
70 | --shlib-path-var) | 76 | --shlib-path-var) |
71 | echo "$SHLIBPATH_VAR" | 77 | echo "$SHLIBPATH_VAR" |
72 | -- | ||
73 | 1.8.3.1 | ||
74 | |||