diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-08-05 01:17:00 +0000 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2019-08-05 01:17:00 +0000 |
| commit | 23b3d5e2ce977c70974109a5e64174dd3c8e13b9 (patch) | |
| tree | e94c9b2e97a80915586e966f88988e3819e4bc38 | |
| parent | 8466b5559e008686681ddd100cf8cdd9d01c3e2c (diff) | |
| download | packages-23b3d5e2ce977c70974109a5e64174dd3c8e13b9.tar.gz packages-23b3d5e2ce977c70974109a5e64174dd3c8e13b9.tar.bz2 packages-23b3d5e2ce977c70974109a5e64174dd3c8e13b9.tar.xz packages-23b3d5e2ce977c70974109a5e64174dd3c8e13b9.zip | |
system/lvm2: Fix build with dash as /bin/sh
Signed-off-by: Samuel Holland <samuel@sholland.org>
| -rw-r--r-- | system/lvm2/APKBUILD | 2 | ||||
| -rw-r--r-- | system/lvm2/dash.patch | 64 |
2 files changed, 66 insertions, 0 deletions
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index fc491a70a..f0cb77a92 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -16,6 +16,7 @@ makedepends_host="$depends_dev util-linux-dev" makedepends="$makedepends_build $makedepends_host" replaces="device-mapper $pkgname-dmeventd" source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz + dash.patch fix-stdio-usage.patch mallinfo.patch mlockall-default-config.patch @@ -88,6 +89,7 @@ udev() { sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a LVM2.2.03.05.tgz +9dbdda2b5b35777ea22be5eedd585de6594e856bf168416f11d003683dad9cc3d8dae5a14e5ae22f251d20809960173cd2e7ea0889949d5d1c1d1e2d10f81508 dash.patch 6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch 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\";" \ + ) > $@ + |