diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2020-02-27 01:48:50 +0100 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2020-03-15 13:30:34 -0700 |
| commit | 28fef8eb25c6791607da75f8e6273b645e542919 (patch) | |
| tree | 563f509ba88d2c8bc89e2422dac5a846bb55d838 | |
| parent | af706c5d83c2807d1fec321602c63aee210f0db6 (diff) | |
| download | meta-openembedded-28fef8eb25c6791607da75f8e6273b645e542919.tar.gz | |
lvm2, libdevmapper: Do not patch configure
Since the do_configure task regenerates the configure script, there is
no need to patch it. Actually doing so will cause problems, which can be
seen by doing:
bitbake lvm2 -c configure
bitbake lvm2 -c patch -f
Reported-by: Andrey Zhizhikin <andrey.z@gmail.com>
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch | 34 |
1 files changed, 1 insertions, 33 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 index 07cb88ffba..91ab239f37 100644 --- 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 | |||
| @@ -4,44 +4,12 @@ Date: Mon, 19 Aug 2019 14:54:43 +0200 | |||
| 4 | Subject: [PATCH] configure: Fix setting of CLDFLAGS default | 4 | Subject: [PATCH] configure: Fix setting of CLDFLAGS default |
| 5 | 5 | ||
| 6 | --- | 6 | --- |
| 7 | configure | 6 +++--- | ||
| 8 | configure.ac | 6 +++--- | 7 | configure.ac | 6 +++--- |
| 9 | 2 files changed, 6 insertions(+), 6 deletions(-) | 8 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 10 | 9 | ||
| 11 | Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] | 10 | Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] |
| 12 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 11 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
| 13 | 12 | ||
| 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 | 13 | diff --git a/configure.ac b/configure.ac |
| 46 | index 5da694631..830edb8da 100644 | 14 | index 5da694631..830edb8da 100644 |
| 47 | --- a/configure.ac | 15 | --- a/configure.ac |
