1 |
alonbl 07/11/20 18:17:33 |
2 |
|
3 |
Added: ecryptfs-utils-30-gpgme.patch |
4 |
Log: |
5 |
Fix locate gpgme issue, bug#199779 |
6 |
(Portage version: 2.1.3.19) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gpgme.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: ecryptfs-utils-30-gpgme.patch |
15 |
=================================================================== |
16 |
diff --git a/configure.ac b/configure.ac |
17 |
index 6778105..ba6484d 100644 |
18 |
--- a/configure.ac |
19 |
+++ b/configure.ac |
20 |
@@ -93,6 +93,13 @@ AC_ARG_ENABLE( |
21 |
) |
22 |
|
23 |
AC_ARG_WITH( |
24 |
+ [gpgme-prefix], |
25 |
+ [AC_HELP_STRING([--with-gpgme-prefix=PATH], [Specify the directory where gpgme install, default /usr])], |
26 |
+ , |
27 |
+ [with_gpgme_prefix="/usr"] |
28 |
+) |
29 |
+ |
30 |
+AC_ARG_WITH( |
31 |
[pamdir], |
32 |
[AC_HELP_STRING([--with-pamdir=PATH], [Specify the directory where PAM modules are stored])], |
33 |
[pamdir="${withval}"], |
34 |
@@ -233,15 +240,13 @@ if test "${enable_tspi}" = "yes" ; then |
35 |
fi |
36 |
|
37 |
if test "${enable_gpg}" = "yes" ; then |
38 |
- if test -z "${GPGME_LIBS}"; then |
39 |
- AC_ARG_VAR([GPGME_CFLAGS], [C compiler flags for gpg]) |
40 |
- AC_ARG_VAR([GPGME_LIBS], [linker flags for gpg]) |
41 |
- AC_CHECK_LIB( |
42 |
- [gpgme], |
43 |
- [gpgme_new], |
44 |
- [GPGME_LIBS="-lgpgme"], |
45 |
- [AC_MSG_ERROR([Cannot find gpgme])] |
46 |
- ) |
47 |
+ AC_MSG_CHECKING([for gpgme]) |
48 |
+ if ! test -x "${with_gpgme_prefix}/bin/gpgme-config"; then |
49 |
+ AC_MSG_ERROR([Cannot locate gpgme]) |
50 |
+ else |
51 |
+ AC_MSG_RESULT([found]) |
52 |
+ GPGME_CFLAGS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --cflags`" |
53 |
+ GPGME_LIBS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --libs`" |
54 |
fi |
55 |
fi |
56 |
|
57 |
@@ -280,6 +285,8 @@ AC_SUBST([pamlibdir]) |
58 |
AC_SUBST([pkgconfigdir]) |
59 |
AC_SUBST([rootsbindir]) |
60 |
AC_SUBST([ecryptfskeymoddir]) |
61 |
+AC_SUBST([GPGME_CFLAGS]) |
62 |
+AC_SUBST([GPGME_LIBS]) |
63 |
AM_CONDITIONAL([BUILD_OPENSSL], [test "${enable_openssl}" = "yes"]) |
64 |
AM_CONDITIONAL([BUILD_PKCS11_HELPER], [test "${enable_pkcs11_helper}" = "yes"]) |
65 |
AM_CONDITIONAL([BUILD_TSPI], [test "${enable_tspi}" = "yes"]) |
66 |
|
67 |
|
68 |
|
69 |
-- |
70 |
gentoo-commits@g.o mailing list |