Patchwork matchbox-desktop: fix link issue against libdl

login
register
mail settings
Submitter Thomas Petazzoni
Date Dec. 18, 2012, 8:38 p.m.
Message ID <1355863126-17526-1-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/207203/
State Accepted
Commit 50bdab9025f3bcacf4f29e928ed2cba892dfc039
Headers show

Comments

Thomas Petazzoni - Dec. 18, 2012, 8:38 p.m.
matchbox-desktop uses dlopen(), so it needs to link against libdl. The
configure.ac and Makefile.am have the necessary provisions to do so,
but the included configure script does not replace LIBADD_DL in
src/Makefile.am as it should.

Therefore, we force the autoreconf of the package, which solves the
problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../matchbox/matchbox-desktop/matchbox-desktop.mk  |    5 +++++
 1 file changed, 5 insertions(+)
Peter Korsgaard - Dec. 18, 2012, 9:09 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> matchbox-desktop uses dlopen(), so it needs to link against libdl. The
 Thomas> configure.ac and Makefile.am have the necessary provisions to do so,
 Thomas> but the included configure script does not replace LIBADD_DL in
 Thomas> src/Makefile.am as it should.

 Thomas> Therefore, we force the autoreconf of the package, which solves the
 Thomas> problem.

Committed, thanks.

Patch

diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index d180d1d..f8e854c 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -13,6 +13,11 @@  MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
+# The bundled configure script does not properly replace LIBADD_DL, so
+# we force an autoreconf even if we don't have any patches touching
+# configure.ac/Makefile.am.
+MATCHBOX_DESKTOP_AUTORECONF = YES
+
 #############################################################
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)