Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 0/2] Automake-1.13
@ 2013-08-22 21:37 Marko Lindqvist
  2013-08-22 21:37 ` [PATCH 1/2] gtk-engines: fix build with automake-1.13 Marko Lindqvist
  2013-08-22 21:37 ` [PATCH 2/2] automake: update to upstream version 1.13.4 Marko Lindqvist
  0 siblings, 2 replies; 6+ messages in thread
From: Marko Lindqvist @ 2013-08-22 21:37 UTC (permalink / raw)
  To: openembedded-core

gtk-engines fix updated, and the automake update patch itself added to
the set. It's probably better to leave latter to beginning of new cycle (1.6)
than to push it in just before 1.5 freeze, as it might break number of
recipes in other layers.

The following changes since commit e473e60d5572f36829068f6d3db9ce9ba9633d71:

  mkfontscale: This no longer needs a full libx11, xproto suffices (2013-08-22 18:29:50 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib cazfi/am13
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=cazfi/am13

Marko Lindqvist (2):
  gtk-engines: fix build with automake-1.13
  automake: update to upstream version 1.13.4

 .../prefer-cpio-over-pax-for-ustar-archives.patch  |   37 ++++++++++----------
 .../{automake_1.12.6.bb => automake_1.13.4.bb}     |    6 ++--
 .../gtk-engines-2.20.2/substitute-tests.patch      |   37 ++++++++++++++++++++
 .../gtk-engines/gtk-engines_2.20.2.bb              |    3 +-
 4 files changed, 60 insertions(+), 23 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%)
 create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch

-- 
1.7.10.4



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 1/2] automake: unhardcode version number
  2013-10-09 23:29 ` [PATCH 0/2] Automake update to 1.13 Marko Lindqvist
@ 2013-10-09 23:29 Marko Lindqvist
  2013-10-09 23:29 ` [PATCH 0/2] Automake update to 1.13 Marko Lindqvist
  0 siblings, 1 reply; 6+ messages in thread
From: Marko Lindqvist @ 2013-10-09 23:29 UTC (permalink / raw)
  To: openembedded-core

Use trim_version to get version part of the executable name.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-devtools/automake/automake_1.12.6.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/automake/automake_1.12.6.bb b/meta/recipes-devtools/automake/automake_1.12.6.bb
index 549051b..b65e5ae 100644
--- a/meta/recipes-devtools/automake/automake_1.12.6.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.6.bb
@@ -3,6 +3,8 @@ LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 
 DEPENDS_class-native = "autoconf-native"
 
+NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}"
+
 RDEPENDS_${PN} += "\
     autoconf \
     perl \
@@ -29,14 +31,12 @@ SRC_URI += "${PATHFIXPATCH} \
 SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
 SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
 
-PR = "r0"
-
 do_install_append () {
     install -d ${D}${datadir}
 
     # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
     # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
-    for i in aclocal aclocal-1.12 automake automake-1.12; do
+    for i in aclocal aclocal-${NAMEVER} automake automake-${NAMEVER}; do
         if [ -f ${D}${bindir}/$i ]; then
             sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
             -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \
-- 
1.8.4.rc3



^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-09 23:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-22 21:37 [PATCH 0/2] Automake-1.13 Marko Lindqvist
2013-08-22 21:37 ` [PATCH 1/2] gtk-engines: fix build with automake-1.13 Marko Lindqvist
2013-08-22 21:37 ` [PATCH 2/2] automake: update to upstream version 1.13.4 Marko Lindqvist
2013-08-23 16:19   ` Saul Wold
2013-08-25 19:13     ` Marko Lindqvist
  -- strict thread matches above, loose matches on Subject: below --
2013-10-09 23:29 [PATCH 1/2] automake: unhardcode version number Marko Lindqvist
2013-10-09 23:29 ` [PATCH 0/2] Automake update to 1.13 Marko Lindqvist
2013-10-09 23:29   ` [PATCH 2/2] automake: update to upstream version 1.13.4 Marko Lindqvist

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox