From dc2a4e50c85e4266ee5734ff034bfa5922349246 Mon Sep 17 00:00:00 2001 From: Dirk Neukirchen Date: Thu, 19 Feb 2015 18:05:14 +0100 Subject: [PATCH 1/2] gnutls: fix build with librt compile errors in config phase with ArchLinux and Fedora 20 config.log trying to link with -I/usr/lib/librt.so: /usr/lib/librt.so: undefined reference to `gettimeofday@GLIBC_2.2.5' or Fedora20: /usr/lib/librt.so: error adding symbols: File in wrong format linkage is AC_LIB_HAVE_LINKFLAGS macro behaviour see http://marc.info/?l=gnulib-bug&m=129660262901148 Signed-off-by: Dirk Neukirchen --- libs/gnutls/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index fed88fa13..4efe5c3a2 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.3.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -123,7 +123,8 @@ CONFIGURE_ARGS+= \ --disable-tests \ --disable-rsa-export \ --with-default-trust-store-dir=/etc/ssl/certs/ \ - --disable-crywrap + --disable-crywrap \ + --with-librt-prefix="$(STAGING_DIR)/" ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y) CONFIGURE_ARGS += --with-included-libtasn1 From a76e6de3fff4a31e4d1524beefdc8756afd76db2 Mon Sep 17 00:00:00 2001 From: Dirk Neukirchen Date: Thu, 19 Feb 2015 19:04:57 +0100 Subject: [PATCH 2/2] gnutls: cleanup old code - rpath is not necessary (buildroot does not use it too) - SED of paths in configure does not seem needed (from pre 3.x version) - remove configure section Signed-off-by: Dirk Neukirchen --- libs/gnutls/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 4efe5c3a2..87cb55472 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.3.13 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -114,6 +114,7 @@ endef CONFIGURE_ARGS+= \ --enable-shared \ --enable-static \ + --disable-rpath \ --disable-libdane \ --disable-guile \ --disable-nls \ @@ -175,13 +176,6 @@ CONFIGURE_ARGS += --enable-cryptodev endif 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 $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig