diff options
Diffstat (limited to 'meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch')
| -rw-r--r-- | meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch deleted file mode 100644 index 07cb88ffba..0000000000 --- a/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch +++ /dev/null | |||
| @@ -1,78 +0,0 @@ | |||
| 1 | From 4a3e707402032788e09282e0f54fdf82c8a0f8fc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Marian Csontos <mcsontos@redhat.com> | ||
| 3 | Date: Mon, 19 Aug 2019 14:54:43 +0200 | ||
| 4 | Subject: [PATCH] configure: Fix setting of CLDFLAGS default | ||
| 5 | |||
| 6 | --- | ||
| 7 | configure | 6 +++--- | ||
| 8 | configure.ac | 6 +++--- | ||
| 9 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
| 10 | |||
| 11 | Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] | ||
| 12 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
| 13 | |||
| 14 | diff --git a/configure b/configure | ||
| 15 | index ff3a59b6b..4c8476502 100755 | ||
| 16 | --- a/configure | ||
| 17 | +++ b/configure | ||
| 18 | @@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : | ||
| 19 | fi | ||
| 20 | case "$host_os" in | ||
| 21 | linux*) | ||
| 22 | - CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" | ||
| 23 | + CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" | ||
| 24 | # equivalent to -rdynamic | ||
| 25 | ELDFLAGS="-Wl,--export-dynamic" | ||
| 26 | # FIXME Generate list and use --dynamic-list=.dlopen.sym | ||
| 27 | @@ -3098,7 +3098,7 @@ case "$host_os" in | ||
| 28 | ;; | ||
| 29 | darwin*) | ||
| 30 | CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" | ||
| 31 | - CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" | ||
| 32 | + CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" | ||
| 33 | ELDFLAGS= | ||
| 34 | CLDWHOLEARCHIVE="-all_load" | ||
| 35 | CLDNOWHOLEARCHIVE= | ||
| 36 | @@ -3111,7 +3111,7 @@ case "$host_os" in | ||
| 37 | BLKDEACTIVATE=no | ||
| 38 | ;; | ||
| 39 | *) | ||
| 40 | - CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" | ||
| 41 | + CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" | ||
| 42 | ;; | ||
| 43 | esac | ||
| 44 | |||
| 45 | diff --git a/configure.ac b/configure.ac | ||
| 46 | index 5da694631..830edb8da 100644 | ||
| 47 | --- a/configure.ac | ||
| 48 | +++ b/configure.ac | ||
| 49 | @@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([]) | ||
| 50 | AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) | ||
| 51 | case "$host_os" in | ||
| 52 | linux*) | ||
| 53 | - CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" | ||
| 54 | + CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" | ||
| 55 | # equivalent to -rdynamic | ||
| 56 | ELDFLAGS="-Wl,--export-dynamic" | ||
| 57 | # FIXME Generate list and use --dynamic-list=.dlopen.sym | ||
| 58 | @@ -51,7 +51,7 @@ case "$host_os" in | ||
| 59 | ;; | ||
| 60 | darwin*) | ||
| 61 | CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" | ||
| 62 | - CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" | ||
| 63 | + CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" | ||
| 64 | ELDFLAGS= | ||
| 65 | CLDWHOLEARCHIVE="-all_load" | ||
| 66 | CLDNOWHOLEARCHIVE= | ||
| 67 | @@ -64,7 +64,7 @@ case "$host_os" in | ||
| 68 | BLKDEACTIVATE=no | ||
| 69 | ;; | ||
| 70 | *) | ||
| 71 | - CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" | ||
| 72 | + CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" | ||
| 73 | ;; | ||
| 74 | esac | ||
| 75 | |||
| 76 | -- | ||
| 77 | 2.21.0 | ||
| 78 | |||
