mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 14:19:52 +00:00
lvm2/libdevmapper: Make it build for native
Backport a patch from upstream master that corrects the passing of link flags through configure. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
255b755381
commit
9817d5fdd2
+78
@@ -0,0 +1,78 @@
|
|||||||
|
From 4a3e707402032788e09282e0f54fdf82c8a0f8fc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marian Csontos <mcsontos@redhat.com>
|
||||||
|
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(-)
|
||||||
|
|
||||||
|
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
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([])
|
||||||
|
AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
|
||||||
|
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
|
||||||
|
@@ -51,7 +51,7 @@ case "$host_os" in
|
||||||
|
;;
|
||||||
|
darwin*)
|
||||||
|
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
|
||||||
|
- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
|
||||||
|
+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
|
||||||
|
ELDFLAGS=
|
||||||
|
CLDWHOLEARCHIVE="-all_load"
|
||||||
|
CLDNOWHOLEARCHIVE=
|
||||||
|
@@ -64,7 +64,7 @@ case "$host_os" in
|
||||||
|
BLKDEACTIVATE=no
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
|
||||||
|
+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
@@ -15,6 +15,7 @@ SRC_URI = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \
|
|||||||
file://0001-Avoid-bashisms-in-init-scripts.patch \
|
file://0001-Avoid-bashisms-in-init-scripts.patch \
|
||||||
file://0005-do-not-build-manual.patch \
|
file://0005-do-not-build-manual.patch \
|
||||||
file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
|
file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
|
||||||
|
file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "5fc07da5461a3794a751dcfc355827d5"
|
SRC_URI[md5sum] = "5fc07da5461a3794a751dcfc355827d5"
|
||||||
SRC_URI[sha256sum] = "550ba750239fd75b7e52c9877565cabffef506bbf6d7f6f17b9700dee56c720f"
|
SRC_URI[sha256sum] = "550ba750239fd75b7e52c9877565cabffef506bbf6d7f6f17b9700dee56c720f"
|
||||||
|
|||||||
Reference in New Issue
Block a user