diff options
Diffstat (limited to 'package/gnutls')
| -rw-r--r-- | package/gnutls/Config.in | 32 | ||||
| -rw-r--r-- | package/gnutls/Makefile | 31 |
2 files changed, 5 insertions, 58 deletions
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index c42bae5bf..71b4eac29 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -68,38 +68,6 @@ config ADK_PACKAGE_LIBGNUTLS_OPENSSL This packages contains the GnuTLS OpenSSL compatibility layer shared library. -config ADK_PACKAGE_LIBGNUTLSXX - prompt "libgnutlsxx....................... The GNU TLS C++ library" - tristate - default n - depends on ADK_CXX - depends on ADK_PACKAGE_LIBGNUTLS - help - GnuTLS is a project that aims to develop a library which provides a - secure layer, over a reliable transport layer. Currently the GnuTLS - library implements the proposed standards by the IETF's TLS working - group. - - This packages contains the GnuTLS C++ shared library. - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_LIBGNUTLSXX -default ADK_COMPILE_GNUTLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_GNUTLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_GNUTLS_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_GNUTLS_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice - config ADK_PACKAGE_GNUTLS_UTILS prompt "gnutls-utils...................... The GNU TLS utilities" tristate diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 358b69b51..235be1de4 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 2.8.3 +PKG_VERSION:= 2.8.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 72b77092c5d1ae01306cd14c0f22d6e4 +PKG_MD5SUM:= e3b2788b79bfc82acbe717e3c54d4e92 PKG_DESCR:= GNU TLS library PKG_SECTION:= libs PKG_DEPENDS:= libgcrypt libtasn1 zlib @@ -17,35 +17,18 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -nodefaultlibs -luClibc++ -PKG_DEPENDS_1:= ${PKG_DEPENDS} uclibc++ -else -PKG_DEPENDS_1:= ${PKG_DEPENDS} libstdcxx -endif - $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -lncurses -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ --with-libgcrypt-prefix=${STAGING_DIR}/usr \ --without-libz-prefix -BUILD_STYLE= auto -INSTALL_STYLE= auto - -ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ - ${WRKBUILD}/libtool -endif +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib @@ -57,9 +40,5 @@ post-install: ${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \ ${IDIR_GNUTLS_UTILS}/usr/bin -ifeq ($(ADK_CXX),y) - ${INSTALL_DIR} ${IDIR_LIBGNUTLSXX}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutlsxx.so.* ${IDIR_LIBGNUTLSXX}/usr/lib -endif include ${TOPDIR}/mk/pkg-bottom.mk |