summaryrefslogtreecommitdiff
path: root/package/gnutls/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/gnutls/Makefile')
-rw-r--r--package/gnutls/Makefile29
1 files changed, 22 insertions, 7 deletions
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 6fb845b44..059f13c67 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -6,19 +6,27 @@
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/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE}))
+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
+
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
+$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
+$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
+$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
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