lvm2: Fix CLDFLAGS-default

The patch does not apply on lvm2 2.03.02. Applying patch 0001-configure-Fix-setting-of-CLDFLAGS-default.patch patching file configure Hunk openembedded#1 FAILED at 3077. Hunk openembedded#2 FAILED at 3098. Hunk openembedded#3 FAILED at 3111. 3 out of 3 hunks FAILED -- rejects in file configure patching file configure.ac Hunk openembedded#2 succeeded at 50 (offset -1 lines). Hunk openembedded#3 succeeded at 63 (offset -1 lines). Patch 0001-configure-Fix-setting-of-CLDFLAGS-default.patch does not apply (enforce with -f) Signed-off-by: Eric Chanudet <[email protected]>
eric-ch · Feb 19, 2020 · c703cae · c703cae
1 parent bb65c27
commit c703cae
Showing 1 changed file with 2 additions and 38 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
@@ -11,39 +11,6 @@ Subject: [PATCH] configure: Fix setting of CLDFLAGS default
 Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc]
 Signed-off-by: Peter Kjellerstedt <[email protected]>
 
-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([])
@@ -55,7 +22,7 @@ index 5da694631..830edb8da 100644
  		# equivalent to -rdynamic
  		ELDFLAGS="-Wl,--export-dynamic"
  		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -51,7 +51,7 @@ case "$host_os" in
+@@ -50,7 +50,7 @@ case "$host_os" in
  		;;
  	darwin*)
  		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@@ -64,7 +31,7 @@ index 5da694631..830edb8da 100644
  		ELDFLAGS=
  		CLDWHOLEARCHIVE="-all_load"
  		CLDNOWHOLEARCHIVE=
-@@ -64,7 +64,7 @@ case "$host_os" in
+@@ -63,7 +63,7 @@ case "$host_os" in
  		BLKDEACTIVATE=no
  		;;
  	*)
@@ -73,6 +40,3 @@ index 5da694631..830edb8da 100644
  		;;
  esac
 
--- 
-2.21.0
-