diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:01:07 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:01:07 +0000 |
| commit | 8b45e21403ceb94f1f7ac3c097a4633c41f589a8 (patch) | |
| tree | 24b6a84d23a39413a5e78dac0ed9d22a534ac69d /user/notmuch/0.28.2-disable-rpath.patch | |
| parent | 88d39bd86ba879437ef28ea2c936dc13617b8774 (diff) | |
| parent | 1bd7fb03c8284065c53d04d0d39d5832f80f2f68 (diff) | |
| download | packages-8b45e21403ceb94f1f7ac3c097a4633c41f589a8.tar.gz packages-8b45e21403ceb94f1f7ac3c097a4633c41f589a8.tar.bz2 packages-8b45e21403ceb94f1f7ac3c097a4633c41f589a8.tar.xz packages-8b45e21403ceb94f1f7ac3c097a4633c41f589a8.zip | |
Merge branch 'notmuch' into 'master'
New packages: gmime and notmuch
See merge request !198
Diffstat (limited to 'user/notmuch/0.28.2-disable-rpath.patch')
| -rw-r--r-- | user/notmuch/0.28.2-disable-rpath.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/user/notmuch/0.28.2-disable-rpath.patch b/user/notmuch/0.28.2-disable-rpath.patch new file mode 100644 index 000000000..cc5102614 --- /dev/null +++ b/user/notmuch/0.28.2-disable-rpath.patch @@ -0,0 +1,48 @@ +From ed15cac16414418c11896071d6ca9238d033f23d Mon Sep 17 00:00:00 2001 +From: Luis Ressel <aranea@aixah.de> +Date: Mon, 25 Feb 2019 08:18:24 +0100 +Subject: [PATCH] Add a configure flag to disable rpaths + +--- + configure | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index a6f5dfa2..5e7e5aa9 100755 +--- a/configure ++++ b/configure +@@ -82,6 +82,7 @@ WITH_API_DOCS=1 + WITH_EMACS=1 + WITH_DESKTOP=1 + WITH_BASH=1 ++WITH_RPATH=1 + WITH_RUBY=1 + WITH_ZSH=1 + WITH_RETRY_LOCK=1 +@@ -241,6 +242,14 @@ for option; do + fi + elif [ "${option}" = '--without-bash-completion' ] ; then + WITH_BASH=0 ++ elif [ "${option%%=*}" = '--with-rpath' ]; then ++ if [ "${option#*=}" = 'no' ]; then ++ WITH_RPATH=0 ++ else ++ WITH_RPATH=1 ++ fi ++ elif [ "${option}" = '--without-rpath' ] ; then ++ WITH_RPATH=0 + elif [ "${option%%=*}" = '--with-ruby' ]; then + if [ "${option#*=}" = 'no' ]; then + WITH_RUBY=0 +@@ -928,7 +937,7 @@ fi + rm -f compat/check_asctime + + printf "Checking for rpath support... " +-if ${CC} -Wl,--enable-new-dtags -Wl,-rpath,/tmp/ -o minimal minimal.c >/dev/null 2>&1 ++if [ $WITH_RPATH = "1" ] && ${CC} -Wl,--enable-new-dtags -Wl,-rpath,/tmp/ -o minimal minimal.c >/dev/null 2>&1 + then + printf "Yes.\n" + rpath_ldflags="-Wl,--enable-new-dtags -Wl,-rpath,\$(libdir)" +-- +2.19.2 + |