diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-02-15 00:58:49 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-07 14:32:27 +0200 |
| commit | 9bf59de43a19111f5c5560830530da039763edd4 (patch) | |
| tree | 84c7a0fa3808d87073d968997045fd113d3ba61c | |
| parent | c0bb57ebd7c455349f930548dcfa1eadc26cd807 (diff) | |
florence3: add missing dependency
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | recipes-support/florence/florence3/0001-src-Makefile.am-add-missing-dependency.patch | 30 | ||||
| -rw-r--r-- | recipes-support/florence/florence3_0.6.3.bb | 5 |
2 files changed, 34 insertions, 1 deletions
diff --git a/recipes-support/florence/florence3/0001-src-Makefile.am-add-missing-dependency.patch b/recipes-support/florence/florence3/0001-src-Makefile.am-add-missing-dependency.patch new file mode 100644 index 0000000..12f5c99 --- /dev/null +++ b/recipes-support/florence/florence3/0001-src-Makefile.am-add-missing-dependency.patch @@ -0,0 +1,30 @@ +From 77755186ad2fb61e8bc0bc68684e3bd631084906 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Wed, 15 Feb 2017 00:40:27 +0100 +Subject: [PATCH] src/Makefile.am: add missing dependency + +Fix race condition in which libflorence is not yet ready when florence +is linked. + +Upstream-Status: Pending + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9d5a417..d1cd944 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -11,6 +11,7 @@ if WITH_RAMBLE + florence_SOURCES += ramble.c + endif + ++florence_DEPENDENCIES = ${lib_LTLIBRARIES} + florence_CPPFLAGS = -I$(top_srcdir) -DICONDIR="\"$(ICONDIR)\""\ + -DFLORENCELOCALEDIR=\""$(florencelocaledir)"\"\ + -DDATADIR="\"$(datadir)/florence\"" $(DEPS_CFLAGS) $(GTK3_CFLAGS)\ +-- +2.6.6 + diff --git a/recipes-support/florence/florence3_0.6.3.bb b/recipes-support/florence/florence3_0.6.3.bb index 1225ae5..bbba494 100644 --- a/recipes-support/florence/florence3_0.6.3.bb +++ b/recipes-support/florence/florence3_0.6.3.bb @@ -16,7 +16,10 @@ RPROVIDES_${PN} += "florence" RREPLACES_${PN} += "florence" RCONFLICTS_${PN} += "florence" -SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}/florence-${PV}.tar.bz2" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/florence/florence/${PV}/florence-${PV}.tar.bz2 \ + file://0001-src-Makefile.am-add-missing-dependency.patch \ +" SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0" SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e" S = "${WORKDIR}/florence-${PV}" |