diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:11:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:11:16 +0200 |
| commit | f3e84309257b915cb8820917a8dd5578f02fe974 (patch) | |
| tree | f3549b877c058c562bf01fc30a8acf23626f2e31 /package/gnutls | |
| parent | 83a08921a2f21d95822ca2a8da37f1e2f85ea717 (diff) | |
patches and update for gcc 4.4.0 allmodconfig
* update gcc to 4.4.0
* update gnutls and ruby
* fix c++ issues for some packages
Diffstat (limited to 'package/gnutls')
| -rw-r--r-- | package/gnutls/Config.in | 18 | ||||
| -rw-r--r-- | package/gnutls/Makefile | 21 |
2 files changed, 36 insertions, 3 deletions
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index cfc6ed4f0..ffe1125b0 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -82,6 +82,24 @@ config ADK_PACKAGE_LIBGNUTLSXX 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 +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 1a46a3b3a..6e04ee823 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -6,9 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 2.6.2 +PKG_VERSION:= 2.6.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= f42e7342cf9c12755577d207fffa9713 +PKG_MD5SUM:= ca2489e29f9dc313a79b9747bb1090e5 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 MASTER_SITES:= ${MASTER_SITE_GNU:=gnutls/} @@ -18,7 +18,15 @@ $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${A $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPENDS})) + +ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y) +TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ +TLDFLAGS+= -nodefaultlibs -luClibc++ +PKG_DEPENDS:= uclibc++ +else +PKG_DEPENDS:= libstdcxx +endif CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-libopencdk-prefix \ @@ -26,6 +34,13 @@ CONFIGURE_ARGS+= --without-libopencdk-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 + post-install: ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib ${CP} ${WRKINST}/usr/lib/libgnutls.so.* ${IDIR_LIBGNUTLS}/usr/lib |