!6 remove rpath

From: @zou_lin77 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-07-28 09:36:10 +00:00 committed by Gitee
commit a4a272f5e2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 8031753da4bed81fd133dceff8187f0e86e02f3f Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Fri, 16 Apr 2021 09:13:43 +0200
Subject: [PATCH] Update also generated configure to disable rpath
as we do not run autogen.sh to regenerate configure, it is still needed
---
configure | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configure b/configure
index d3b6f42..9d3607e 100755
--- a/configure
+++ b/configure
@@ -10765,7 +10765,9 @@ fi
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
if test -n "$ac_tool_prefix"; then
--
1.8.3.1

View File

@ -1,6 +1,6 @@
Name: pinentry
Version: 1.1.1
Release: 1
Release: 2
Summary: A new module that contains various interfaces to enter a PIN/passphrase.
License: GPLv2+
@ -11,6 +11,8 @@ Source0: https://www.gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar
Source1: pinentry-wrapper
Source2: https://www.gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
Patch0: Update-also-generated-configure-to-disable-rpath.patch
BuildRequires: pkgconfig(Qt5Widgets) libcap-devel ncurses-devel libassuan-devel
BuildRequires: libgpg-error-devel libsecret-devel pkgconfig(Qt5Core) gcc
BuildRequires: pkgconfig(Qt5Gui) gcr-devel gtk2-devel
@ -90,6 +92,9 @@ fi
%doc ChangeLog NEWS TODO
%changelog
* Thu Jul 28 2022 zoulin <zoulin13@h-partners.com> - 1.1.1-2
- remove rpath
* Thu Dec 30 2021 zoulin <zoulin13@huawei.com> - 1.1.1-1
- update version to 1.1.1