Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #987 from plntyk/gnutls-fixes-v2

Browse source 
Gnutls fixes v2
This commit is contained in:
Ted Hess 2015-03-04 14:59:32 -05:00
commit 37fc15c0e7
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/gnutls/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls PKG_NAME:=gnutls
PKG_VERSION:=3.3.13 PKG_VERSION:=3.3.13
PKG_RELEASE:=1 PKG_RELEASE:=3
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -114,6 +114,7 @@ endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-rpath \
--disable-libdane \ --disable-libdane \
--disable-guile \ --disable-guile \
--disable-nls \ --disable-nls \
@ -123,7 +124,8 @@ CONFIGURE_ARGS+= \
--disable-tests \ --disable-tests \
--disable-rsa-export \ --disable-rsa-export \
--with-default-trust-store-dir=/etc/ssl/certs/ \ --with-default-trust-store-dir=/etc/ssl/certs/ \
--disable-crywrap --disable-crywrap \
--with-librt-prefix="$(STAGING_DIR)/"
ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y) ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y)
CONFIGURE_ARGS += --with-included-libtasn1 CONFIGURE_ARGS += --with-included-libtasn1
@ -174,13 +176,6 @@ CONFIGURE_ARGS += --enable-cryptodev
endif endif
TARGET_CFLAGS += $(FPIC) 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/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig