Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
From 8cee09b59a8c1ff2ebfc8c46097825d2eafdc4dd Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sat, 16 May 2015 17:32:13 +0200
|
||||
Subject: [PATCH] Fix static linking problem with libgcrypt
|
||||
|
||||
When libgcrypt is used, it is linked with libgpg-error, so we should
|
||||
also test that libgpg-error is available, and include -lgpg-error in
|
||||
the LIBS variable.
|
||||
|
||||
This fixes build issues like:
|
||||
|
||||
CCLD xml
|
||||
/home/thomas/projets/buildroot/output/host/usr/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/libexslt.a(crypto.o): In function `_exsltCryptoGcryptInit':
|
||||
crypto.c:(.text+0x112): undefined reference to `_gcry_check_version'
|
||||
/home/thomas/projets/buildroot/output/host/usr/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/libexslt.a(crypto.o): In function `_exsltCryptoRc4DecryptFunction':
|
||||
crypto.c:(.text+0x316): undefined reference to `_gcry_cipher_open'
|
||||
crypto.c:(.text+0x32a): undefined reference to `_gcry_strerror'
|
||||
crypto.c:(.text+0x34c): undefined reference to `_gcry_cipher_setkey'
|
||||
|
||||
Which are caused by the AC_SEARCH_LIBS() test for libgcrypt to fail
|
||||
due to -lgpg-error not been present in the LIBS variable.
|
||||
|
||||
Note that using PKG_CHECK_MODULES() would be a much much better
|
||||
replacement than this complicated handling of static libraries, but
|
||||
it's a much more significant effort.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4db0129..e378996 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -125,6 +125,7 @@ AS_IF([test "x$STATIC_LIBS" != xno],
|
||||
[AC_SEARCH_LIBS([libiconv_open], [iconv], [], [], "$USER_LIBS")], "$USER_LIBS")
|
||||
AC_SEARCH_LIBS([clock_gettime], [rt], [], [], "$USER_LIBS")
|
||||
AC_SEARCH_LIBS([deflate], [z], [], [], "$USER_LIBS")
|
||||
+ AC_SEARCH_LIBS([gpg_strerror], [gpg-error], [], [], "$USER_LIBS")
|
||||
AC_SEARCH_LIBS([gcry_cipher_encrypt], [gcrypt], [], [], "$USER_LIBS")
|
||||
|
||||
# Checks for inet libraries:
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_XMLSTARLET
|
||||
bool "xmlstarlet"
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
select BR2_PACKAGE_LIBXSLT
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
Command Line XML Toolkit
|
||||
|
||||
http://xmlstar.sourceforge.net/
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 47b4ed042ea2909257f2a386001af49fceb303f84da7214779ccf99fffc6bbba xmlstarlet-1.5.0.tar.gz
|
||||
@@ -0,0 +1,29 @@
|
||||
################################################################################
|
||||
#
|
||||
# xmlstarlet
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XMLSTARLET_VERSION = 1.5.0
|
||||
XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
|
||||
XMLSTARLET_LICENSE = MIT
|
||||
XMLSTARLET_LICENSE_FILES = COPYING
|
||||
# We're patching configure.ac
|
||||
XMLSTARLET_AUTORECONF = YES
|
||||
|
||||
XMLSTARLET_DEPENDENCIES += libxml2 libxslt \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
XMLSTARLET_CONF_OPTS += \
|
||||
--with-libxml-prefix=${STAGING_DIR}/usr \
|
||||
--with-libxslt-prefix=${STAGING_DIR}/usr \
|
||||
--with-libiconv-prefix=${STAGING_DIR}/usr
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
XMLSTARLET_CONF_OPTS += --enable-static-libs
|
||||
XMLSTARLET_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libxml-2.0`"
|
||||
else
|
||||
XMLSTARLET_CONF_OPTS += --disable-static-libs
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user