diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-25 00:45:26 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-25 00:45:26 +0000 |
| commit | 800cfeb6fc2dadb5eca69afde9a720fd5694c1af (patch) | |
| tree | 191fc288774252cb7f093636b295fbf61bbabfee /system/lvm2/dash.patch | |
| parent | 6e65d53c8fdeae4573f0395c5009a69e45fadc70 (diff) | |
| parent | b1eeaf176be85f2529d9e52a599a266a47b039e7 (diff) | |
| download | packages-800cfeb6fc2dadb5eca69afde9a720fd5694c1af.tar.gz packages-800cfeb6fc2dadb5eca69afde9a720fd5694c1af.tar.bz2 packages-800cfeb6fc2dadb5eca69afde9a720fd5694c1af.tar.xz packages-800cfeb6fc2dadb5eca69afde9a720fd5694c1af.zip | |
Merge branch 'bump.djt.20200211' into 'master'
djt's regular bumps (february 2020)
See merge request adelie/packages!399
Diffstat (limited to 'system/lvm2/dash.patch')
| -rw-r--r-- | system/lvm2/dash.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/system/lvm2/dash.patch b/system/lvm2/dash.patch deleted file mode 100644 index d2ab014f8..000000000 --- a/system/lvm2/dash.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- 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\";" \ - ) > $@ - |