From 120fe54761b68e8e3679ef6816b7355d0f401341 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 21 Oct 2014 20:38:33 -0700 Subject: [PATCH] gnutls: Use libgnurx instead of libpcreposix It's more widely used and has fewer dependencies. Signed-off-by: Timothy Gu --- src/gnutls.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index d559362a..0e087176 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -8,7 +8,7 @@ $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.2/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2//$($(PKG)_FILE) -$(PKG)_DEPS := gcc gettext gmp nettle pcre zlib +$(PKG)_DEPS := gcc gettext gmp libgnurx nettle zlib define $(PKG)_UPDATE $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/ | \ @@ -32,10 +32,7 @@ define $(PKG)_BUILD --disable-doc \ --enable-local-libopts \ --with-included-libtasn1 \ - --with-libregex='$(PREFIX)/$(TARGET)' \ - --with-regex-header=pcreposix.h \ - --with-libregex-cflags="`'$(TARGET)-pkg-config' libpcreposix --cflags`" \ - --with-libregex-libs="`'$(TARGET)-pkg-config' libpcreposix --libs`" \ + --with-libregex-libs="-lgnurx" \ --without-p11-kit \ --disable-silent-rules \ CPPFLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \