diff options
author | Ross Burton <ross.burton@intel.com> | 2013-06-18 09:27:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-18 17:33:16 +0100 |
commit | 2bdfdfe29bc93ae418010e65594e77d5100e7a02 (patch) | |
tree | 57dd3923555ce99455f4c29bf010c667269d6725 /meta/recipes-sato | |
parent | e8581c4d1873fa07c1346c54734daf536ade6475 (diff) | |
download | poky-2bdfdfe29bc93ae418010e65594e77d5100e7a02.tar.gz |
sato-screenshot: bump SRCREV for linkage fixes
Newer toolchains are stricter with linking. Patches have been merged upstream
so bump the SRCREV to use them.
fix_ldadd_order was also merged upstream, so delete it.
(From OE-Core rev: 8d25bce5d550fff01b97a36ef8e1e3e155e2dee6)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch | 15 | ||||
-rw-r--r-- | meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb | 5 |
2 files changed, 2 insertions, 18 deletions
diff --git a/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch deleted file mode 100644 index 7d9689e893..0000000000 --- a/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Fix the ordering of LDADD options to fix a compilation failure. | ||
2 | |||
3 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am | ||
8 | --- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700 | ||
9 | +++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800 | ||
10 | @@ -23,4 +23,4 @@ | ||
11 | # A standalone tool for running from a terminal and scripts | ||
12 | bin_PROGRAMS = screenshot | ||
13 | screenshot_SOURCES = main.c | ||
14 | -screenshot_LDADD = $(GTK_LIBS) libshot.la | ||
15 | +screenshot_LDADD = libshot.la $(GTK_LIBS) | ||
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb index ff92142315..3bad8534cf 100644 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb | |||
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
8 | file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" | 8 | file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" |
9 | 9 | ||
10 | DEPENDS = "matchbox-panel-2" | 10 | DEPENDS = "matchbox-panel-2" |
11 | SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945" | 11 | SRCREV = "3a9688e8a01b63a78f402b4e7c0b8b005fcdfa29" |
12 | PV = "0.1+git${SRCPV}" | 12 | PV = "0.1+git${SRCPV}" |
13 | PR = "r2" | 13 | PR = "r2" |
14 | 14 | ||
15 | SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \ | 15 | SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git" |
16 | file://fix_ldadd_order.patch" | ||
17 | 16 | ||
18 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
19 | 18 | ||