[package] add libmodbus

[openwrt/svn-archive/archive.git] / libs / gnutls / Makefile

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index e2c0af9eceea3ca76ae81c698754e8875eeedf53..e38f537f1893157ddb0b2c7f1f109261047ec402 100644 (file)
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2009 OpenWrt.org
+# Copyright (C) 2005-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=2.8.5
-PKG_RELEASE:=1
+PKG_VERSION:=2.8.6
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/gnutls \
        ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
-PKG_MD5SUM:=
+PKG_MD5SUM:=eb0a6d7d3cb9ac684d971c14f9f6d3ba
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_LIBTOOL_PATHS:=. lib libextra
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gnutls/Default
+  SUBMENU:=SSL
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=GNU TLS
@@ -39,7 +42,7 @@ $(call Package/gnutls/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE+= (certool utility)
-  DEPENDS+= +libgnutls +libncurses +libreadline
+  DEPENDS+= +libgnutls +libgnutls-extra +libncurses +libreadline
 endef
 
 define Package/certtool/description
@@ -65,9 +68,8 @@ endef
 
 define Package/libgnutls
 $(call Package/gnutls/Default)
- TITLE+= (library)
- DEPENDS+= +zlib +libgcrypt +libgpg-error
- SUBMENU:=SSL
+  TITLE+= (library)
+  DEPENDS+= +zlib +libgcrypt +libgpg-error
 endef
 
 define Package/libgnutls/description
@@ -78,9 +80,8 @@ endef
 
 define Package/libgnutls-extra
 $(call Package/gnutls/Default)
- TITLE+= (extra library)
- DEPENDS+= +libgnutls
- SUBMENU:=SSL
+  TITLE+= (extra library)
+  DEPENDS+= +libgnutls
 endef
 
 define Package/libgnutls-extra/description
@@ -91,9 +92,8 @@ endef
 
 define Package/libgnutls-openssl
 $(call Package/gnutls/Default)
- TITLE+= (OpenSSL compat library)
- DEPENDS+= +libgnutls
- SUBMENU:=SSL
+  TITLE+= (OpenSSL compat library)
+  DEPENDS+= +libgnutls
 endef
 
 define Package/libgnutls-openssl/description
@@ -101,8 +101,6 @@ $(call Package/gnutls/Default/description)
  This package contains the GnuTLS OpenSSL compatibility layer shared library.
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
 CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
@@ -113,26 +111,32 @@ CONFIGURE_ARGS+= \
        --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
        --with-libreadline-prefix="$(STAGING_DIR)/usr" \
        --with-libz-prefix="$(STAGING_DIR)/usr" \
+       --without-lzo \
 
 # XXX: AM_CFLAGS duplicates with CFLAGS
-MAKE_ARGS:= \
+MAKE_FLAGS:= \
        AM_CFLAGS="" \
 
+TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 define Build/Configure
        $(SED) 's,-I$$$${includedir},,g' $(PKG_BUILD_DIR)/configure
        $(SED) 's,-L$$$${libdir},,g' $(PKG_BUILD_DIR)/configure
        $(call Build/Configure/Default)
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/gnutls \
+               $(1)/usr/include/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \
+               $(1)/usr/lib/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/certtool/conffiles
@@ -143,15 +147,17 @@ define Package/certtool/install
        $(INSTALL_DIR) $(1)/etc/gnutls
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/certtool.cfg $(1)/etc/gnutls/
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
 endef
 
 
 define Package/gnutls-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/srptool $(1)/usr/bin/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} \
+               $(PKG_INSTALL_DIR)/usr/bin/psktool \
+               $(PKG_INSTALL_DIR)/usr/bin/srptool \
+               $(1)/usr/bin/
 endef