[Buildroot] [PATCH 1/3] c-icap: bump to version 0.4.2

[Buildroot] [PATCH 1/3] c-icap: bump to version 0.4.2

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2:
	Add a comment explaining the need to pre-seed (Thomas P)
---
 package/c-icap/c-icap.hash | 2 +-
 package/c-icap/c-icap.mk   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/c-icap/c-icap.hash b/package/c-icap/c-icap.hash
index 89c70f423e00..2b083ef659ab 100644
--- a/package/c-icap/c-icap.hash
+++ b/package/c-icap/c-icap.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 46b97fab73dbb9e8def8e34c3f94048c92f50a5341bb85bec4f6f6349aec529a c_icap-0.3.5.tar.gz
+sha256 b138c7d7d9828d54c3307bcfe7b4917911266593832ffc26a60df9a0dfd2511e c_icap-0.4.2.tar.gz
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index b4defb87379a..cff642cd9cc1 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ICAP_VERSION = 0.3.5
+C_ICAP_VERSION = 0.4.2
 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz
 C_ICAP_SITE = http://downloads.sourceforge.net/c-icap
 C_ICAP_LICENSE = LGPLv2.1+
@@ -17,6 +17,9 @@ C_ICAP_CONF_OPTS = \
 	--without-perl \
 	--enable-large-files \
 	--enable-ipv6
+# Pre-seed cache variables for tests done with AC_TRY_RUN that are not
+# cross-compile friendly
+C_ICAP_CONF_ENV = ac_cv_10031b_ipc_sem=yes ac_cv_fcntl=yes
 
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
 C_ICAP_CONF_OPTS += --with-berkeleydb
-- 
2.8.0.rc3

[Buildroot] [PATCH 2/3] c-icap-modules: bump to version 0.4.2

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/c-icap-modules/c-icap-modules.hash | 6 +++---
 package/c-icap-modules/c-icap-modules.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash
index cf325ecddd5e..5df14498711e 100644
--- a/package/c-icap-modules/c-icap-modules.hash
+++ b/package/c-icap-modules/c-icap-modules.hash
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.3.x/
-md5	25a904f98cddbcc7431b22720cd3996e	c_icap_modules-0.3.2.tar.gz
-sha1	98dd7b3bf40b8831e297ffa8c4e1eaf7cef57cd0	c_icap_modules-0.3.2.tar.gz
+# From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/
+md5	5acd9487679ed47fbee00270d436718d	c_icap_modules-0.4.2.tar.gz
+sha1	e5f4203980b732b9de165c1e83c4703734c3e0e2	c_icap_modules-0.4.2.tar.gz
diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk
index 5252a8106c1a..cf388aaabcc5 100644
--- a/package/c-icap-modules/c-icap-modules.mk
+++ b/package/c-icap-modules/c-icap-modules.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ICAP_MODULES_VERSION = 0.3.2
+C_ICAP_MODULES_VERSION = 0.4.2
 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz
 C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap
 C_ICAP_MODULES_LICENSE = GPLv2+
-- 
2.8.0.rc3

[Buildroot] [PATCH 3/3] c-icap: avoid host library search path

[Baruch Siach]

Add AUTORECONF as a workaround to the effect of '-Wl,-rpath -Wl,/usr/lib' that
c-icap adds to the linker command.

Fixes:
http://autobuild.buildroot.net/results/077/077374329b2782dbb4b4a9ee7af264cdda311ccc/
http://autobuild.buildroot.net/results/057/057a88179150a4f02990d7b9b0d8f2de3c9da1a3/
http://autobuild.buildroot.net/results/da6/da62b80989df6b8f1b5557b4987d7a6999d30bb8/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2:
	Force AUTORECONF instead of overriding exec_prefix
---
 package/c-icap/c-icap.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index cff642cd9cc1..9325e877d7a3 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -20,6 +20,13 @@ C_ICAP_CONF_OPTS = \
 # Pre-seed cache variables for tests done with AC_TRY_RUN that are not
 # cross-compile friendly
 C_ICAP_CONF_ENV = ac_cv_10031b_ipc_sem=yes ac_cv_fcntl=yes
+# c-icap adds '-Wl,-rpath -Wl,/usr/lib' to the link command line. This causes
+# the linker to search for libraries that are listed as NEEDED in the
+# libicapapi.so ELF header in host libraries, which breaks the build. The
+# affected library is libz. Forcing AUTORECONF adds -lz to the link command
+# line, and that makes the linker look first in sysroot, thus avoiding the
+# build breakage.
+C_ICAP_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
 C_ICAP_CONF_OPTS += --with-berkeleydb
-- 
2.8.0.rc3

[Buildroot] [PATCH 1/3] c-icap: bump to version 0.4.2

[Thomas Petazzoni]

Hello,

On Tue, 26 Apr 2016 10:36:53 +0300, Baruch Siach wrote:
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v2:
> 	Add a comment explaining the need to pre-seed (Thomas P)
> ---
>  package/c-icap/c-icap.hash | 2 +-
>  package/c-icap/c-icap.mk   | 5 ++++-
>  2 files changed, 5 insertions(+), 2 deletions(-)

All three patches applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com