summaryrefslogtreecommitdiff
path: root/legacy/notmuch/0.28.2-disable-rpath.patch
diff options
context:
space:
mode:
authorCyberLeo <cyberleo@cyberleo.net>2020-03-28 05:45:52 -0500
committerCyberLeo <cyberleo@cyberleo.net>2020-03-28 05:45:52 -0500
commit9297468fa579836e3a6a381b798feb6b78217c2d (patch)
tree53168212f427afbcf0693b534530a4af803152e9 /legacy/notmuch/0.28.2-disable-rpath.patch
parenta63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff)
parentda5a69b65a8791fffa6e93366ee585f87eff136d (diff)
downloadpackages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz
packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2
packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz
packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip
Merge branch 'master' into zfs
Diffstat (limited to 'legacy/notmuch/0.28.2-disable-rpath.patch')
-rw-r--r--legacy/notmuch/0.28.2-disable-rpath.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/legacy/notmuch/0.28.2-disable-rpath.patch b/legacy/notmuch/0.28.2-disable-rpath.patch
new file mode 100644
index 000000000..cc5102614
--- /dev/null
+++ b/legacy/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
+