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