mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

puzzles: move ASNEEDED over-ride into the puzzles recipe

Browse Source 
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>
This commit is contained in:
Andre McCurdy
2018-05-09 14:46:47 -07:00
committed by Richard Purdie
parent f8fa4aab98
commit 837a2a6f99
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/conf/distro/include/as-needed.inc
View File

@@ -2,7 +2,6 @@
ASNEEDED = "-Wl,--as-needed"
ASNEEDED_pn-openobex = ""
ASNEEDED_pn-puzzles = ""
ASNEEDED_pn-rpm = ""
TARGET_LDFLAGS += "${ASNEEDED}"

35
meta/recipes-sato/puzzles/puzzles_git.bb
View File

@@ -1,20 +1,20 @@
SUMMARY = "Simon Tatham's Portable Puzzle Collection"
HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
DEPENDS = "libxt"
# The libxt requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
file://fix-compiling-failure-with-option-g-O.patch \
file://0001-Use-labs-instead-of-abs.patch \
file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
"
UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "c6e0161dd475415316ed66dc82794d68e52f0025"
PE = "2"
@@ -24,24 +24,13 @@ S = "${WORKDIR}/git"
inherit autotools distro_features_check pkgconfig
CFLAGS_append = " -Wno-deprecated-declarations"
PACKAGECONFIG ??= "gtk3"
PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
PACKAGES += "${PN}-extra"
FILES_${PN} = ""
FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
CFLAGS_append = " -Wno-deprecated-declarations"
python __anonymous () {
var = d.expand("FILES_${PN}")
data = d.getVar(var, False)
for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
data = data + " ${bindir}/%s" % name
data = data + " ${datadir}/applications/%s.desktop" % name
d.setVar(var, data)
}
ASNEEDED = ""
do_configure_prepend () {
cd ${S}
@@ -74,3 +63,17 @@ STOP
fi
done
}
PACKAGES += "${PN}-extra"
FILES_${PN} = ""
FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
python __anonymous () {
var = d.expand("FILES_${PN}")
data = d.getVar(var, False)
for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
data = data + " ${bindir}/%s" % name
data = data + " ${datadir}/applications/%s.desktop" % name
d.setVar(var, data)
}