summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/pinentry/pinentry-1.2.1
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/pinentry/pinentry-1.2.1')
-rw-r--r--meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch196
-rw-r--r--meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch170
2 files changed, 366 insertions, 0 deletions
diff --git a/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch
new file mode 100644
index 0000000000..bb7e43b1e7
--- /dev/null
+++ b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch
@@ -0,0 +1,196 @@
1From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001
2From: Armin Kuster <akuster@mvista.com>
3Date: Fri, 2 Sep 2005 11:50:01 +0000
4Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and
5
6Convert to pkg-config support to match changes done to
7the gpg-error recipe for gpg-error.pc generation.
8
9Upstream-Status: Inappropriate [OE specific]
10
11Signed-off-by: Armin Kuster <akuster@mvista.com>
12
13---
14 m4/gpg-error.m4 | 160 ++----------------------------------------------
15 1 file changed, 4 insertions(+), 156 deletions(-)
16
17diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
18index 4b5cd40..7dfbb83 100644
19--- a/m4/gpg-error.m4
20+++ b/m4/gpg-error.m4
21@@ -26,160 +26,12 @@ dnl config script does not match the host specification the script
22 dnl is added to the gpg_config_script_warn variable.
23 dnl
24 AC_DEFUN([AM_PATH_GPG_ERROR],
25-[ AC_REQUIRE([AC_CANONICAL_HOST])
26- gpg_error_config_prefix=""
27- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
28- dnl since that is consistent with how our three siblings use the directory/
29- dnl package name in --with-$dir_name-prefix=PFX.
30- AC_ARG_WITH(libgpg-error-prefix,
31- AS_HELP_STRING([--with-libgpg-error-prefix=PFX],
32- [prefix where GPG Error is installed (optional)]),
33- [gpg_error_config_prefix="$withval"])
34-
35- dnl Accept --with-gpg-error-prefix and make it work the same as
36- dnl --with-libgpg-error-prefix above, for backwards compatibility,
37- dnl but do not document this old, inconsistently-named option.
38- AC_ARG_WITH(gpg-error-prefix,,
39- [gpg_error_config_prefix="$withval"])
40-
41- if test x"${GPG_ERROR_CONFIG}" = x ; then
42- if test x"${gpg_error_config_prefix}" != x ; then
43- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
44- else
45- case "${SYSROOT}" in
46- /*)
47- if test -x "${SYSROOT}/bin/gpg-error-config" ; then
48- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
49- fi
50- ;;
51- '')
52- ;;
53- *)
54- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
55- ;;
56- esac
57- fi
58- fi
59-
60- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
61- min_gpg_error_version=ifelse([$1], ,1.33,$1)
62- ok=no
63-
64- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
65- if test "$GPGRT_CONFIG" != "no"; then
66- # Determine gpgrt_libdir
67- #
68- # Get the prefix of gpgrt-config assuming it's something like:
69- # <PREFIX>/bin/gpgrt-config
70- gpgrt_prefix=${GPGRT_CONFIG%/*/*}
71- possible_libdir1=${gpgrt_prefix}/lib
72- # Determine by using system libdir-format with CC, it's like:
73- # Normal style: /usr/lib
74- # GNU cross style: /usr/<triplet>/lib
75- # Debian style: /usr/lib/<multiarch-name>
76- # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
77- # It is assumed that CC is specified to the one of host on cross build.
78- if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
79- sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
80-/g;p;}"); then
81- # From the output of -print-search-dirs, select valid pkgconfig dirs.
82- libdir_candidates=$(for dir in $libdir_candidates; do
83- if p=$(cd $dir 2>/dev/null && pwd); then
84- test -d "$p/pkgconfig" && echo $p;
85- fi
86- done)
87-
88- for possible_libdir0 in $libdir_candidates; do
89- # possible_libdir0:
90- # Fallback candidate, the one of system-installed (by $CC)
91- # (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
92- # possible_libdir1:
93- # Another candidate, user-locally-installed
94- # (<gpgrt_prefix>/lib)
95- # possible_libdir2
96- # Most preferred
97- # (<gpgrt_prefix>/<triplet>/lib,
98- # <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
99- if test "${possible_libdir0##*/}" = "lib"; then
100- possible_prefix0=${possible_libdir0%/lib}
101- possible_prefix0_triplet=${possible_prefix0##*/}
102- if test -z "$possible_prefix0_triplet"; then
103- continue
104- fi
105- possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
106- else
107- possible_prefix0=${possible_libdir0%%/lib*}
108- possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
109- fi
110- if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
111- gpgrt_libdir=${possible_libdir2}
112- elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
113- gpgrt_libdir=${possible_libdir1}
114- elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
115- gpgrt_libdir=${possible_libdir0}
116- fi
117- if test -n "$gpgrt_libdir"; then break; fi
118- done
119- else
120- # When we cannot determine system libdir-format, use this:
121- gpgrt_libdir=${possible_libdir1}
122- fi
123- else
124- unset GPGRT_CONFIG
125- fi
126-
127- if test -n "$gpgrt_libdir"; then
128- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
129- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
130- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
131- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
132- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
133- else
134- unset GPGRT_CONFIG
135- fi
136- elif test "$GPG_ERROR_CONFIG" != "no"; then
137- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
138- unset GPGRT_CONFIG
139- fi
140- if test "$GPG_ERROR_CONFIG" != "no"; then
141- req_major=`echo $min_gpg_error_version | \
142- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
143- req_minor=`echo $min_gpg_error_version | \
144- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
145- major=`echo $gpg_error_config_version | \
146- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
147- minor=`echo $gpg_error_config_version | \
148- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
149- if test "$major" -gt "$req_major"; then
150- ok=yes
151- else
152- if test "$major" -eq "$req_major"; then
153- if test "$minor" -ge "$req_minor"; then
154- ok=yes
155- fi
156- fi
157- fi
158- fi
159- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
160+[
161+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
162+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no])
163 if test $ok = yes; then
164- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
165- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
166- if test -z "$GPGRT_CONFIG"; then
167- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
168- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
169- else
170- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
171- GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
172- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
173- GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
174- fi
175- AC_MSG_RESULT([yes ($gpg_error_config_version)])
176 ifelse([$2], , :, [$2])
177- if test -z "$GPGRT_CONFIG"; then
178- gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
179- else
180- gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
181- fi
182+ gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none`
183 if test x"$gpg_error_config_host" != xnone ; then
184 if test x"$gpg_error_config_host" != x"$host" ; then
185 AC_MSG_WARN([[
186@@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
187 fi
188 fi
189 else
190- GPG_ERROR_CFLAGS=""
191- GPG_ERROR_LIBS=""
192- GPG_ERROR_MT_CFLAGS=""
193- GPG_ERROR_MT_LIBS=""
194 AC_MSG_RESULT(no)
195 ifelse([$3], , :, [$3])
196 fi
diff --git a/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch
new file mode 100644
index 0000000000..f4aec2d1c3
--- /dev/null
+++ b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch
@@ -0,0 +1,170 @@
1From 26fb6c3faa27180c8ed9ada1728c3d8683a65f3a Mon Sep 17 00:00:00 2001
2From: Armin Kuster <akuster@mvista.com>
3Date: Thu, 22 May 2014 10:50:00 +0100
4Subject: [PATCH] libassuan: Improve pkgconfig support
5
6Convert to pkg-config support to match changes done to
7the libassuan recipe for libassuan.pc generation.
8
9Upstream-Status: Inappropriate [OE specific]
10
11Signed-off-by: Armin Kuster <akuster@mvista.com>
12
13---
14 configure.ac | 4 +--
15 m4/libassuan.m4 | 93 ++++---------------------------------------------
16 2 files changed, 9 insertions(+), 88 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index d8dcc0c..ca51766 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -267,8 +267,8 @@ if test "$have_libassuan" = "yes"; then
23 [version of the libassuan library])
24 fi
25
26-COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS"
27-COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS"
28+COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS"
29+COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS"
30
31
32 dnl Checks for libsecmem.
33diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
34index df50484..2057412 100644
35--- a/m4/libassuan.m4
36+++ b/m4/libassuan.m4
37@@ -15,30 +15,8 @@ dnl
38 dnl Common code used for libassuan detection [internal]
39 dnl Returns ok set to yes or no.
40 dnl
41-AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
42-[ AC_REQUIRE([AC_CANONICAL_HOST])
43- AC_ARG_WITH(libassuan-prefix,
44- AS_HELP_STRING([--with-libassuan-prefix=PFX],
45- [prefix where LIBASSUAN is installed (optional)]),
46- libassuan_config_prefix="$withval", libassuan_config_prefix="")
47- if test x$libassuan_config_prefix != x ; then
48- if test x${LIBASSUAN_CONFIG+set} != xset ; then
49- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
50- fi
51- fi
52-
53- use_gpgrt_config=""
54- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
55- if $GPGRT_CONFIG libassuan --exists; then
56- LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
57- AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
58- use_gpgrt_config=yes
59- fi
60- fi
61- if test -z "$use_gpgrt_config"; then
62- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
63- fi
64-
65+AC_DEFUN([AM_PATH_LIBASSUAN_COMMON],
66+[
67 tmp=ifelse([$1], ,1:0.9.2,$1)
68 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
69 req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
70@@ -48,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
71 min_libassuan_version="$tmp"
72 fi
73
74- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
75- ok=no
76- if test "$LIBASSUAN_CONFIG" != "no"; then
77- req_major=`echo $min_libassuan_version | \
78- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
79- req_minor=`echo $min_libassuan_version | \
80- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
81- req_micro=`echo $min_libassuan_version | \
82- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
83-
84- if test -z "$use_gpgrt_config"; then
85- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
86- else
87- libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
88- fi
89- major=`echo $libassuan_config_version | \
90- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
91- minor=`echo $libassuan_config_version | \
92- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
93- micro=`echo $libassuan_config_version | \
94- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
95-
96- if test "$major" -gt "$req_major"; then
97- ok=yes
98- else
99- if test "$major" -eq "$req_major"; then
100- if test "$minor" -gt "$req_minor"; then
101- ok=yes
102- else
103- if test "$minor" -eq "$req_minor"; then
104- if test "$micro" -ge "$req_micro"; then
105- ok=yes
106- fi
107- fi
108- fi
109- fi
110- fi
111- fi
112-
113- if test $ok = yes; then
114- AC_MSG_RESULT([yes ($libassuan_config_version)])
115- else
116- AC_MSG_RESULT(no)
117- fi
118+ PKG_CHECK_MODULES(LIBASSUAN_COMMON, [libassuan >= $min_libassuan_version libassuan], [ok=yes], [ok=no])
119
120 if test $ok = yes; then
121 if test "$req_libassuan_api" -gt 0 ; then
122- if test -z "$use_gpgrt_config"; then
123- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
124- else
125- tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
126- fi
127+ tmp=`$PKG_CONFIG --variable=api_version libassuan 2>/dev/null || echo 0`
128 if test "$tmp" -gt 0 ; then
129 AC_MSG_CHECKING([LIBASSUAN API version])
130 if test "$req_libassuan_api" -eq "$tmp" ; then
131@@ -114,11 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
132
133 if test $ok = yes; then
134 if test x"$host" != x ; then
135- if test -z "$use_gpgrt_config"; then
136- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
137- else
138- libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
139- fi
140+ libassuan_config_host=`$PKG_CONFIG --host libassuan 2>/dev/null || echo 0`
141 if test x"$libassuan_config_host" != xnone ; then
142 if test x"$libassuan_config_host" != x"$host" ; then
143 AC_MSG_WARN([[
144@@ -141,7 +68,7 @@ dnl Test whether libassuan has at least MINIMUM-VERSION. This is
145 dnl used to test for features only available in newer versions.
146 dnl
147 AC_DEFUN([AM_CHECK_LIBASSUAN],
148-[ _AM_PATH_LIBASSUAN_COMMON($1)
149+[ AM_PATH_LIBASSUAN_COMMON($1)
150 if test $ok = yes; then
151 ifelse([$2], , :, [$2])
152 else
153@@ -157,16 +84,10 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
154 dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
155 dnl
156 AC_DEFUN([AM_PATH_LIBASSUAN],
157-[ _AM_PATH_LIBASSUAN_COMMON($1)
158+[ AM_PATH_LIBASSUAN_COMMON($1)
159 if test $ok = yes; then
160- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
161- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
162 ifelse([$2], , :, [$2])
163 else
164- LIBASSUAN_CFLAGS=""
165- LIBASSUAN_LIBS=""
166 ifelse([$3], , :, [$3])
167 fi
168- AC_SUBST(LIBASSUAN_CFLAGS)
169- AC_SUBST(LIBASSUAN_LIBS)
170 ])
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-23 16:46:40 +0000