X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=bashizm.patch;h=13d75cce79c06444eef9587cd02e1dbb7cb6e9c2;hp=51870d61a553fa3bfba12705ff71b9fe0f42c89f;hb=8aeeb45669ed91ea9b02d25b089dc563a6861a79;hpb=18e8851e535770810e99237e0b9d70393c713b38

diff --git a/bashizm.patch b/bashizm.patch
index 51870d6..13d75cc 100644
--- a/bashizm.patch
+++ b/bashizm.patch
@@ -1,61 +1,61 @@
-diff -ur LVM2.2.03.01.orig/configure LVM2.2.03.01/configure
---- LVM2.2.03.01.orig/configure	2018-10-31 14:54:24.000000000 +0000
-+++ LVM2.2.03.01/configure	2018-12-04 08:44:19.090403000 +0000
-@@ -3067,7 +3067,7 @@
+diff -ur lvm2-2_03_07.orig/configure lvm2-2_03_07/configure
+--- lvm2-2_03_07.orig/configure	2019-11-30 14:45:51.000000000 +0100
++++ lvm2-2_03_07/configure	2019-12-12 15:12:39.649000000 +0100
+@@ -3077,7 +3077,7 @@
  fi
  case "$host_os" in
  	linux*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
 +		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
  		# equivalent to -rdynamic
  		ELDFLAGS="-Wl,--export-dynamic"
  		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -3087,7 +3087,7 @@
+@@ -3098,7 +3098,7 @@
  		;;
  	darwin*)
  		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 +		CLDFLAGS="$CLDFLAGS"
  		ELDFLAGS=
  		CLDWHOLEARCHIVE="-all_load"
  		CLDNOWHOLEARCHIVE=
-@@ -3099,9 +3099,6 @@
+@@ -3110,9 +3110,6 @@
  		FSADM=no
  		BLKDEACTIVATE=no
  		;;
 -	*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 -		;;
  esac
  
  ################################################################################
-diff -ur LVM2.2.03.01.orig/configure.ac LVM2.2.03.01/configure.ac
---- LVM2.2.03.01.orig/configure.ac	2018-10-31 14:54:24.000000000 +0000
-+++ LVM2.2.03.01/configure.ac	2018-12-04 08:44:19.091403000 +0000
+diff -ur lvm2-2_03_07.orig/configure.ac lvm2-2_03_07/configure.ac
+--- lvm2-2_03_07.orig/configure.ac	2019-11-30 14:45:51.000000000 +0100
++++ lvm2-2_03_07/configure.ac	2019-12-12 15:11:27.591000000 +0100
 @@ -30,7 +30,7 @@
  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"
 +		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
  		# equivalent to -rdynamic
  		ELDFLAGS="-Wl,--export-dynamic"
  		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
  		;;
  	darwin*)
  		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 +		CLDFLAGS="$CLDFLAGS"
  		ELDFLAGS=
  		CLDWHOLEARCHIVE="-all_load"
  		CLDNOWHOLEARCHIVE=
-@@ -62,9 +62,6 @@
+@@ -63,9 +63,6 @@
  		FSADM=no
  		BLKDEACTIVATE=no
  		;;
 -	*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 -		;;
  esac