summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-09 14:46:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:56:50 +0100
commit837a2a6f993caddc9693403ef9508d7b317e689b (patch)
tree081f8b7eede2f96c3fdd652a4dfcaa0b408fd7dc
parentf8fa4aab98b07ff8f998cbec5ea705d8843952e1 (diff)
downloadpoky-837a2a6f993caddc9693403ef9508d7b317e689b.tar.gz
puzzles: move ASNEEDED over-ride into the puzzles recipe
Move the recipe specific over-ride for ASNEEDED into the recipe to make it more apparent that the over-ride is being applied (and that it should be re-checked on version updates, etc). Also misc minor recipe cleanup (re-order variables to follow the OE style guide, etc). (From OE-Core rev: d3653e8525e048d9968b949dbff5304c1fd94480) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/as-needed.inc1
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb35
2 files changed, 19 insertions, 17 deletions
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index c67f2f3da3..f56d432bd5 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -2,7 +2,6 @@
2ASNEEDED = "-Wl,--as-needed" 2ASNEEDED = "-Wl,--as-needed"
3 3
4ASNEEDED_pn-openobex = "" 4ASNEEDED_pn-openobex = ""
5ASNEEDED_pn-puzzles = ""
6ASNEEDED_pn-rpm = "" 5ASNEEDED_pn-rpm = ""
7 6
8TARGET_LDFLAGS += "${ASNEEDED}" 7TARGET_LDFLAGS += "${ASNEEDED}"
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 3670ab81fb..7d08b964f8 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -1,20 +1,20 @@
1SUMMARY = "Simon Tatham's Portable Puzzle Collection" 1SUMMARY = "Simon Tatham's Portable Puzzle Collection"
2HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" 2HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
3 5
4DEPENDS = "libxt" 6DEPENDS = "libxt"
5 7
6# The libxt requires x11 in DISTRO_FEATURES 8# The libxt requires x11 in DISTRO_FEATURES
7REQUIRED_DISTRO_FEATURES = "x11" 9REQUIRED_DISTRO_FEATURES = "x11"
8 10
9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
11
12SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ 11SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
13 file://fix-compiling-failure-with-option-g-O.patch \ 12 file://fix-compiling-failure-with-option-g-O.patch \
14 file://0001-Use-labs-instead-of-abs.patch \ 13 file://0001-Use-labs-instead-of-abs.patch \
15 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ 14 file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
16 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ 15 file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
17 " 16 "
17
18UPSTREAM_CHECK_COMMITS = "1" 18UPSTREAM_CHECK_COMMITS = "1"
19SRCREV = "c6e0161dd475415316ed66dc82794d68e52f0025" 19SRCREV = "c6e0161dd475415316ed66dc82794d68e52f0025"
20PE = "2" 20PE = "2"
@@ -24,24 +24,13 @@ S = "${WORKDIR}/git"
24 24
25inherit autotools distro_features_check pkgconfig 25inherit autotools distro_features_check pkgconfig
26 26
27CFLAGS_append = " -Wno-deprecated-declarations"
28
29PACKAGECONFIG ??= "gtk3" 27PACKAGECONFIG ??= "gtk3"
30PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," 28PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
31PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," 29PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
32 30
33PACKAGES += "${PN}-extra" 31CFLAGS_append = " -Wno-deprecated-declarations"
34FILES_${PN} = ""
35FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
36 32
37python __anonymous () { 33ASNEEDED = ""
38 var = d.expand("FILES_${PN}")
39 data = d.getVar(var, False)
40 for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
41 data = data + " ${bindir}/%s" % name
42 data = data + " ${datadir}/applications/%s.desktop" % name
43 d.setVar(var, data)
44}
45 34
46do_configure_prepend () { 35do_configure_prepend () {
47 cd ${S} 36 cd ${S}
@@ -74,3 +63,17 @@ STOP
74 fi 63 fi
75 done 64 done
76} 65}
66
67PACKAGES += "${PN}-extra"
68
69FILES_${PN} = ""
70FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
71
72python __anonymous () {
73 var = d.expand("FILES_${PN}")
74 data = d.getVar(var, False)
75 for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
76 data = data + " ${bindir}/%s" % name
77 data = data + " ${datadir}/applications/%s.desktop" % name
78 d.setVar(var, data)
79}