aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2020-02-27 01:48:50 +0100
committerArmin Kuster <akuster808@gmail.com>2020-03-15 13:30:34 -0700
commit28fef8eb25c6791607da75f8e6273b645e542919 (patch)
tree563f509ba88d2c8bc89e2422dac5a846bb55d838
parentaf706c5d83c2807d1fec321602c63aee210f0db6 (diff)
downloadmeta-openembedded-contrib-28fef8eb25c6791607da75f8e6273b645e542919.tar.gz
meta-openembedded-contrib-28fef8eb25c6791607da75f8e6273b645e542919.tar.bz2
meta-openembedded-contrib-28fef8eb25c6791607da75f8e6273b645e542919.zip
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.patch34
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
Subject: [PATCH] configure: Fix setting of CLDFLAGS default
---
- configure | 6 +++---
configure.ac | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc]
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
-diff --git a/configure b/configure
-index ff3a59b6b..4c8476502 100755
---- a/configure
-+++ b/configure
-@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then :
- fi
- case "$host_os" in
- linux*)
-- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
-+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
- # equivalent to -rdynamic
- ELDFLAGS="-Wl,--export-dynamic"
- # FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -3098,7 +3098,7 @@ case "$host_os" in
- ;;
- darwin*)
- CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
-- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- ELDFLAGS=
- CLDWHOLEARCHIVE="-all_load"
- CLDNOWHOLEARCHIVE=
-@@ -3111,7 +3111,7 @@ case "$host_os" in
- BLKDEACTIVATE=no
- ;;
- *)
-- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- ;;
- esac
-
diff --git a/configure.ac b/configure.ac
index 5da694631..830edb8da 100644
--- a/configure.ac