Skip to contentSkip to conversation

spandsp: fix static build with jpeg enabled

PATCH New Baruch Siach 3 participants 5 messages Oct 12, 2018

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 spandsp: fix static build with jpeg enabled

When jpeg is enabled libtiff links with it, but the spandsp configure test doesn't take that into account, so the configure test fails. Use pkg-config to add the required tiff dependencies.

Fixes:
http://autobuild.buildroot.net/results/243/243f1d1271a767556e0a4cd56a42fcc8c1a371ed/
http://autobuild.buildroot.net/results/485/48527e144bc4ad3eaab807f302888380bd9e78bb/
http://autobuild.buildroot.net/results/058/05885325ec274cb9860d423c57eed5e7063aedc0/

Cc Bernd Kuhls <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/spandsp/spandsp.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/spandsp/spandsp.mk +2 -1
index 4b1f89cf4b34..fc9db34bfcae 100644
@@ -10,8 +10,9 @@ SPANDSP_SITE = https://www.soft-switch.org/downloads/spandsp/snapshots
 SPANDSP_LICENSE = LGPL-2.1 (library), GPL-2.0 (test suite)
 SPANDSP_LICENSE_FILES = COPYING
 
-SPANDSP_DEPENDENCIES = tiff
+SPANDSP_DEPENDENCIES = tiff host-pkgconf
 SPANDSP_INSTALL_STAGING = YES
+SPANDSP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"
 
 SPANDSP_CONF_OPTS = \
 	--disable-doc \
Signature · 1 line
2.19.1
author
#1 lore raw

PATCH 2/2 spandsp: remove redundant --disable-doc

We pass --disable-doc by default to all autotools packages.

Cc Bernd Kuhls <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/spandsp/spandsp.mk | 1 -
 1 file changed, 1 deletion(-)
package/spandsp/spandsp.mk +0 -1
index fc9db34bfcae..e02c15a77677 100644
@@ -15,7 +15,6 @@ SPANDSP_INSTALL_STAGING = YES
 SPANDSP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"
 
 SPANDSP_CONF_OPTS = \
-	--disable-doc \
 	--disable-builtin-tiff \
 	$(if $(BR2_X86_CPU_HAS_MMX),--enable-mmx,--disable-mmx) \
 	$(if $(BR2_X86_CPU_HAS_SSE),--enable-sse,--disable-sse) \
Signature · 1 line
2.19.1
#3 lore raw

PATCH 1/2 spandsp: fix static build with jpeg enabled

In reply to Baruch Siach
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

When jpeg is enabled libtiff links with it, but the spandsp configure test doesn't take that into account, so the configure test fails. Use pkg-config to add the required tiff dependencies.

Quoted 7 lines

Fixes:
http://autobuild.buildroot.net/results/243/243f1d1271a767556e0a4cd56a42fcc8c1a371ed/
http://autobuild.buildroot.net/results/485/48527e144bc4ad3eaab807f302888380bd9e78bb/
http://autobuild.buildroot.net/results/058/05885325ec274cb9860d423c57eed5e7063aedc0/

Cc Bernd Kuhls <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 spandsp: fix static build with jpeg enabled

In reply to Baruch Siach

Hello,

package/spandsp/spandsp.mk SPANDSP_SITE = https://www.soft-switch.org/downloads/spandsp/snapshots · line 15

Quoted 4 lines · Baruch Siach
package/spandsp/spandsp.mk +2 -1
-SPANDSP_DEPENDENCIES = tiff
+SPANDSP_DEPENDENCIES = tiff host-pkgconf
 SPANDSP_INSTALL_STAGING = YES
+SPANDSP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"

I have to say I continue to dislike such hacks, and would very much prefer a change to the package configure.ac script to use pkg-config directly.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com