aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-navigation/orrery/orrery_2.7.bb')
-rw-r--r--meta-oe/recipes-navigation/orrery/orrery_2.7.bb14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
index 010f65fb9b..96a7018de2 100644
--- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
+++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
@@ -1,11 +1,11 @@
SUMMARY = "Astronomical application which displays the night sky"
HOMEPAGE = "http://projects.openmoko.org/projects/orrery/"
SECTION = "x11/scientific"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe"
DEPENDS = "gtk+"
-inherit distro_features_check autotools-brokensep pkgconfig
+inherit features_check autotools-brokensep pkgconfig
REQUIRED_DISTRO_FEATURES = "x11"
@@ -13,6 +13,7 @@ SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.ta
file://orrery.png \
file://use.GdkPixbuf.patch \
file://0001-orrery-Fix-sprintf-format.patch \
+ file://0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch \
"
SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b"
@@ -20,16 +21,17 @@ SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbd
S = "${WORKDIR}/${BPN}"
-do_configure_prepend() {
+do_configure:prepend() {
# fix DSO issue with binutils-2.22
- sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am
+ sed -i 's/ -lrt$/ -lrt -lm/g' ${S}/Makefile.am
}
-do_install_append() {
+do_install:append() {
install -d ${D}${datadir}/orrery
cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery
chown -R root:root ${D}${datadir}/orrery
install -d ${D}${datadir}/icons
install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons
+ rm -rf ${D}${datadir}/orrery/Makefile*
}
-FILES_${PN} += "${datadir}/icons/orrery.png"
+FILES:${PN} += "${datadir}/icons/orrery.png"