diff --git a/packages/security/libgcrypt/package.mk b/packages/security/libgcrypt/package.mk index 5d349fc43f..4579c4a25c 100644 --- a/packages/security/libgcrypt/package.mk +++ b/packages/security/libgcrypt/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libgcrypt" -PKG_VERSION="1.6.5" +PKG_VERSION="1.7.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" @@ -31,10 +31,18 @@ PKG_LONGDESC="Libgcrypt is a general purpose cryptographic library based on the PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -PKG_CONFIGURE_OPTS_TARGET="ac_cv_sys_symbol_underscore=no \ +PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \ + ac_cv_sys_symbol_underscore=no \ --enable-asm \ --with-gnu-ld \ - --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr" + --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \ + --disable-doc" + +pre_configure_target() { + # libgcrypt-1.7.x fails to build with LTO support + # see for example https://bugs.gentoo.org/show_bug.cgi?id=581114 + strip_lto +} post_makeinstall_target() { sed -e "s:\(['= ]\)\"/usr:\\1\"$SYSROOT_PREFIX/usr:g" -i src/$PKG_NAME-config diff --git a/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch b/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch deleted file mode 100644 index 6fe71ddbe9..0000000000 --- a/packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur libgcrypt-1.6.4/Makefile.am libgcrypt-1.6.4.patch/Makefile.am ---- libgcrypt-1.6.4/Makefile.am 2015-09-07 14:05:57.000000000 +0200 -+++ libgcrypt-1.6.4.patch/Makefile.am 2016-01-03 00:00:27.392411468 +0100 -@@ -24,8 +24,8 @@ - # (A suitable gitlog-to-changelog script can be found in GnuPG master.) - GITLOG_TO_CHANGELOG=gitlog-to-changelog - --DIST_SUBDIRS = m4 compat mpi cipher random src doc tests --SUBDIRS = compat mpi cipher random src doc tests -+DIST_SUBDIRS = m4 compat mpi cipher random src -+SUBDIRS = compat mpi cipher random src - - EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ - ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \