helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 22:01:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

vala-dbus-binding-tool: fix the version inside the package

Browse Source 
* "vala-dbus-binding-tool_version" string ends as the version and e.g. libfso-glib doesn't like it at all
  | configure: error: Package requirements (vala-dbus-binding-tool-1.0 >= 0.4.0) were not met:
  | Requested 'vala-dbus-binding-tool-1.0 >= 0.4.0' but version of Vala-DBus-Binding-Tool is vala-dbus-binding-tool_version

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2015-05-05 13:46:47 +02:00
parent 0850d63009
commit 937e6bce9b
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch Normal file
View File

@ -0,0 +1,34 @@
From 8abed2e5bf8e7815b11df6d22042d5f0ac8efcb0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 5 May 2015 13:43:35 +0200
Subject: [PATCH] configure.ac: don't use dash in m4 macro names
* otherwise it doesn't get expanded and vala-dbus-binding-tool ends with version 'vala-dbus-binding-tool_version'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 48f007c..18d0bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-m4_define([vala-dbus-binding-tool_released], [0])
-m4_define([vala-dbus-binding-tool_base_version], [1.0])
-m4_define([vala-dbus-binding-tool_maybe_gitrev], m4_if(vala-dbus-binding-tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])]))
-m4_define([vala-dbus-binding-tool_version], m4_if(vala-dbus-binding-tool_released, [1], [vala-dbus-binding-tool_base_version], [vala-dbus-binding-tool_base_version-vala-dbus-binding-tool_maybe_gitrev]))
+m4_define([vala_dbus_binding_tool_released], [0])
+m4_define([vala_dbus_binding_tool_base_version], [1.0])
+m4_define([vala_dbus_binding_tool_maybe_gitrev], m4_if(vala_dbus_binding_tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])]))
+m4_define([vala_dbus_binding_tool_version], m4_if(vala_dbus_binding_tool_released, [1], [vala_dbus_binding_tool_base_version], [vala_dbus_binding_tool_base_version-vala_dbus_binding_tool_maybe_gitrev]))
-AC_INIT([vala-dbus-binding-tool], [vala-dbus-binding-tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool])
+AC_INIT([vala-dbus-binding-tool], [vala_dbus_binding_tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool])
AC_CONFIG_SRCDIR([src/Makefile.am])
AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([dist-bzip2])
--
2.3.5

4
meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
View File

@ -12,5 +12,7 @@ require vala-dbus-binding-tool.inc
SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12" SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12"
PV = "0.4.0+gitr${SRCPV}" PV = "0.4.0+gitr${SRCPV}"
SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https" SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https \
file://0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch \
"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"