diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-05 01:31:58 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-05 01:31:58 +0000 |
| commit | 8a6e7b726fc93908618526a83d8243365ff3ae46 (patch) | |
| tree | 90367516eae2c2fb80909b8df2e2aaa06fb6456c /system/lvm2/dash.patch | |
| parent | 42b5c5b3b14fc62fb14f529035e24f62862a781c (diff) | |
| parent | c3a4b6cb60e71fc6eba379e858b846859cd46e9a (diff) | |
| download | packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.gz packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.bz2 packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.xz packages-8a6e7b726fc93908618526a83d8243365ff3ae46.zip | |
Merge branch 'arm-fixes' into 'master'
Fixes for issues found on the armv7 builder
See merge request adelie/packages!308
Diffstat (limited to 'system/lvm2/dash.patch')
| -rw-r--r-- | system/lvm2/dash.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/system/lvm2/dash.patch b/system/lvm2/dash.patch new file mode 100644 index 000000000..d2ab014f8 --- /dev/null +++ b/system/lvm2/dash.patch @@ -0,0 +1,64 @@ +--- LVM2.2.03.05/configure ++++ LVM2.2.03.05/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 + +--- LVM2.2.03.05/tools/Makefile.in ++++ LVM2.2.03.05/tools/Makefile.in +@@ -167,7 +167,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX) + + command-count.h: $(srcdir)/command-lines.in Makefile + @echo " [GEN] $@" +- $(Q) set -o pipefail && \ ++ $(Q) \ + ( cat $(top_srcdir)/tools/license.inc && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ + echo -n "#define COMMAND_COUNT " && \ +@@ -176,7 +176,7 @@ command-count.h: $(srcdir)/command-lines.in Makefile + + cmds.h: $(srcdir)/command-lines.in Makefile + @echo " [GEN] $@" +- $(Q) set -o pipefail && \ ++ $(Q) \ + ( cat $(top_srcdir)/tools/license.inc && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ + echo "cmd(CMD_NONE, none)" && \ +@@ -186,11 +186,11 @@ cmds.h: $(srcdir)/command-lines.in Makefile + + command-lines-input.h: $(srcdir)/command-lines.in Makefile + @echo " [GEN] $@" +- $(Q) set -o pipefail && \ ++ $(Q) \ + ( cat $(top_srcdir)/tools/license.inc && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ +- echo -en "const char _command_input[] =\n\n\"" && \ ++ printf "const char _command_input[] =\n\n\"" && \ + $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \ +- echo "\\n\";" \ ++ printf "%s\n" "\\n\";" \ + ) > $@ + |