Honor disabled rpath for pinentry-qt
This commit is contained in:
parent
d731926be1
commit
9d3e012a91
27
pinentry-1.1.1-rpath.patch
Normal file
27
pinentry-1.1.1-rpath.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
commit 6e8ad3150566d16a20cb3b54267191bcb0c14208
|
||||||
|
Author: Damien Goutte-Gattat <dgouttegattat@incenp.org>
|
||||||
|
Date: Tue Feb 23 22:05:37 2021 +0000
|
||||||
|
|
||||||
|
qt: Honor the --disable-rpath option.
|
||||||
|
|
||||||
|
* m4/qt.m4: Do not set rpath if --disable-rpath has been specified
|
||||||
|
at configure time.
|
||||||
|
--
|
||||||
|
|
||||||
|
GnuPG-bug-id: 5307
|
||||||
|
Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
|
||||||
|
|
||||||
|
diff --git a/m4/qt.m4 b/m4/qt.m4
|
||||||
|
index f8ef3f6..5f9de3f 100644
|
||||||
|
--- a/m4/qt.m4
|
||||||
|
+++ b/m4/qt.m4
|
||||||
|
@@ -59,7 +59,9 @@ AC_DEFUN([FIND_QT],
|
||||||
|
|
||||||
|
qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core`
|
||||||
|
if test -n "$qtlibdir"; then
|
||||||
|
+ if test "$enable_rpath" != "no"; then
|
||||||
|
PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\""
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_TOOL(MOC, moc)
|
@ -10,6 +10,7 @@ Source0: https://gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2
|
|||||||
Source1: https://gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
|
Source1: https://gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
|
||||||
|
|
||||||
Patch1: pinentry-1.1.1-coverity.patch
|
Patch1: pinentry-1.1.1-coverity.patch
|
||||||
|
Patch2: pinentry-1.1.1-rpath.patch
|
||||||
|
|
||||||
# borrowed from opensuse
|
# borrowed from opensuse
|
||||||
Source10: pinentry-wrapper
|
Source10: pinentry-wrapper
|
||||||
@ -89,6 +90,7 @@ This package contains the tty version of the PIN entry dialog.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1 -b .coverity
|
%patch1 -p1 -b .coverity
|
||||||
|
%patch2 -p1 -b .rpath
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
Loading…
Reference in New Issue
Block a user