summaryrefslogtreecommitdiff
path: root/package/gnutls
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-22 19:29:20 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-22 19:29:20 +0200
commitd279b5d1fe744cac44da7cd1b51f9ba6a2cc4647 (patch)
treebf575aca8f9ce9cf088ce3aee992fc846cd6e130 /package/gnutls
parent32a82e38679501da738199135b35f93ddc8aca0a (diff)
fix libmix packages, while checking all packages make some style cleanup
Diffstat (limited to 'package/gnutls')
-rw-r--r--package/gnutls/Makefile18
1 files changed, 15 insertions, 3 deletions
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 8951a1462..912912b2b 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gnutls
PKG_VERSION:= 3.2.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7c0dd4f77dc70c64d2f385aeb2df4157
PKG_DESCR:= GNU TLS library
PKG_SECTION:= crypto
@@ -13,6 +13,8 @@ PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
PKG_BUILDDEP:= libgcrypt liblzo libtasn1 zlib ncurses libnettle
PKG_URL:= http://www.gnu.org/software/gnutls/
PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
+PKG_LIBNAME:= libgnutls
+PKG_OPTS:= dev
PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
PKGSD_GNUTLS_UTILS:= GNU TLS utilities
@@ -28,9 +30,13 @@ PKGFB_WITH_CRYPTODEV:= cryptodev-linux
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS},${PKG_OPTS}))
$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKGSC_GNUTLS_UTILS}))
$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA}))
$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL}))
@@ -46,15 +52,21 @@ CONFIGURE_ARGS+= --disable-rpath \
--without-p11-kit
CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar'
-post-install:
+libgnutls-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib
+
+libgnutls-extra-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
${CP} ${WRKINST}/usr/lib/libgnutlsxx.so* \
${IDIR_LIBGNUTLS_EXTRA}/usr/lib
+
+libgnutls-openssl-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \
${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
+
+gnutls-utils-install:
${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin
${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \
${IDIR_GNUTLS_UTILS}/usr/bin