diff options
| author |   Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-06-01 11:36:53 +0000 |
|---|---|---|
| committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-06-01 11:36:53 +0000 |
| commit | a9e6a4b823b8e4d08d54bd84e37a95314262ba50 (patch) | |
| tree | d82cebb77a460116141193dd30b0bc83384934b8 /dev-libs | |
| parent | Make sure the pkg-config file is installed for libgcrypt. (diff) | |
| download | embedded-cross-a9e6a4b823b8e4d08d54bd84e37a95314262ba50.tar.gz embedded-cross-a9e6a4b823b8e4d08d54bd84e37a95314262ba50.tar.bz2 embedded-cross-a9e6a4b823b8e4d08d54bd84e37a95314262ba50.zip | |
Make the libgcrypt.m4 macro use pkg-config.
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libgcrypt/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-pkgconfig-support.patch | 104 |
2 files changed, 105 insertions, 1 deletions
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest index 5730161..e96f2d3 100644 --- a/dev-libs/libgcrypt/Manifest +++ b/dev-libs/libgcrypt/Manifest @@ -1,4 +1,4 @@ AUX libgcrypt-gpg-error-pkgconfig.patch 751 RMD160 beaff3d93f045b5e89d96c9711451f2cbf83bcf5 SHA1 1791e360c0883b0b8418b5bad8d96c541975eef0 SHA256 a327393eabcd9071e7a2d3f011b376b2be46f05d42b91a512ab88cd57c2690dc -AUX libgcrypt-pkgconfig-support.patch 2173 RMD160 714a3fbfc1e7bf4db27260b720e4dd4250cbce58 SHA1 3236ae94373c2b1e0267f96998fac5b4f617c62e SHA256 d0c558182cfc3198fbce77dfa1c663bd823e0455d1b118019dd1d08d882e50f9 +AUX libgcrypt-pkgconfig-support.patch 6070 RMD160 8a1e91fd3862c7bdce1a75a984abd388d953b9a4 SHA1 44598fe3ec17b7e2589eb2f4140ada47fc53664f SHA256 4644ed6d10366c74e7c00a6a863da6a6a9b4f250572722568130e92b5e2be97f DIST libgcrypt-1.4.4.tar.bz2 1143139 RMD160 65fd66687bd17bc8a680c59f26a8edf3e21e7dbf SHA1 3987f0efcbb7048c136d5c859e88eee1763a14f6 SHA256 3212b88080cf8fa006164d38fc176fafa5c29591c8384f284ab880db0dbf306f EBUILD libgcrypt-1.4.4.ebuild 1346 RMD160 456e11fd4f06a680283441ba911e4327cf2a6f00 SHA1 36811f2daaa8508a059dcb37c4709bc68bd40c13 SHA256 87d5c43dcc7929439f30e19189eb83304e59109f70bf07b1dfdbcf70866c0689 diff --git a/dev-libs/libgcrypt/files/libgcrypt-pkgconfig-support.patch b/dev-libs/libgcrypt/files/libgcrypt-pkgconfig-support.patch index ff26960..81c53e7 100644 --- a/dev-libs/libgcrypt/files/libgcrypt-pkgconfig-support.patch +++ b/dev-libs/libgcrypt/files/libgcrypt-pkgconfig-support.patch @@ -65,3 +65,107 @@ Index: src/libgcrypt.pc.in include_HEADERS = gcrypt.h gcrypt-module.h lib_LTLIBRARIES = libgcrypt.la +--- src/libgcrypt.m4 2008-08-19 15:20:04.000000000 +0000 ++++ src/libgcrypt.m4.new 2009-06-01 09:45:26.000000000 +0000 +@@ -21,88 +21,29 @@ + dnl with a changed API. + dnl + AC_DEFUN([AM_PATH_LIBGCRYPT], +-[ AC_ARG_WITH(libgcrypt-prefix, +- AC_HELP_STRING([--with-libgcrypt-prefix=PFX], +- [prefix where LIBGCRYPT is installed (optional)]), +- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") +- if test x$libgcrypt_config_prefix != x ; then +- if test x${LIBGCRYPT_CONFIG+set} != xset ; then +- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config +- fi +- fi +- +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++[ + tmp=ifelse([$1], ,1:1.2.0,$1) ++ PKG_CHECK_MODULES([LIBGCRYPT], [libgcryt >= "$tmp"]) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +- min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_libgcrypt_api=0 +- min_libgcrypt_version="$tmp" + fi +- +- AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) + ok=no +- if test "$LIBGCRYPT_CONFIG" != "no" ; then +- req_major=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` +- major=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- minor=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- micro=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` +- if test "$major" -gt "$req_major"; then +- ok=yes +- else +- if test "$major" -eq "$req_major"; then +- if test "$minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$minor" -eq "$req_minor"; then +- if test "$micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- AC_MSG_RESULT([yes ($libgcrypt_config_version)]) +- else +- AC_MSG_RESULT(no) +- fi +- if test $ok = yes; then +- # If we have a recent libgcrypt, we should also check that the +- # API is compatible +- if test "$req_libgcrypt_api" -gt 0 ; then +- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- AC_MSG_CHECKING([LIBGCRYPT API version]) +- if test "$req_libgcrypt_api" -eq "$tmp" ; then +- AC_MSG_RESULT([okay]) +- else +- ok=no +- AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) +- fi ++ # If we have a recent libgcrypt, we should also check that the ++ # API is compatible ++ if test "$req_libgcrypt_api" -gt 0 ; then ++ tmp=`$PKG_CONFIG --variable=api-version libgcryt 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ AC_MSG_CHECKING([LIBGCRYPT API version]) ++ if test "$req_libgcrypt_api" -eq "$tmp" ; then ++ AC_MSG_RESULT([okay]) ++ else ++ ok=no ++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) + fi + fi + fi +- if test $ok = yes; then +- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` +- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` +- ifelse([$2], , :, [$2]) +- else +- LIBGCRYPT_CFLAGS="" +- LIBGCRYPT_LIBS="" +- ifelse([$3], , :, [$3]) +- fi + AC_SUBST(LIBGCRYPT_CFLAGS) + AC_SUBST(LIBGCRYPT_LIBS) + ]) |