mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
e8581c4d18
commit
2bdfdfe29b
@@ -1,15 +0,0 @@
|
|||||||
Fix the ordering of LDADD options to fix a compilation failure.
|
|
||||||
|
|
||||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
|
||||||
|
|
||||||
diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
|
|
||||||
--- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700
|
|
||||||
+++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800
|
|
||||||
@@ -23,4 +23,4 @@
|
|
||||||
# A standalone tool for running from a terminal and scripts
|
|
||||||
bin_PROGRAMS = screenshot
|
|
||||||
screenshot_SOURCES = main.c
|
|
||||||
-screenshot_LDADD = $(GTK_LIBS) libshot.la
|
|
||||||
+screenshot_LDADD = libshot.la $(GTK_LIBS)
|
|
||||||
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
|||||||
file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
|
file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
|
||||||
|
|
||||||
DEPENDS = "matchbox-panel-2"
|
DEPENDS = "matchbox-panel-2"
|
||||||
SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
|
SRCREV = "3a9688e8a01b63a78f402b4e7c0b8b005fcdfa29"
|
||||||
PV = "0.1+git${SRCPV}"
|
PV = "0.1+git${SRCPV}"
|
||||||
PR = "r2"
|
PR = "r2"
|
||||||
|
|
||||||
SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
|
SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git"
|
||||||
file://fix_ldadd_order.patch"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user