diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-05 13:46:47 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-11 11:34:04 +0200 |
commit | 937e6bce9bc65a8806d70b3aadeac24575a77615 (patch) | |
tree | 5fd4422a328c7483732d8f73c3e5afacc54d6b28 /meta-oe/recipes-devtools/vala-dbus-binding-tool | |
parent | 0850d6300982a8b5e2639d750ee24f1ff4a5f70d (diff) | |
download | meta-openembedded-937e6bce9bc65a8806d70b3aadeac24575a77615.tar.gz |
vala-dbus-binding-tool: fix the version inside the package
* "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>
Diffstat (limited to 'meta-oe/recipes-devtools/vala-dbus-binding-tool')
2 files changed, 37 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch new file mode 100644 index 000000000..14d84ae8a --- /dev/null +++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 8abed2e5bf8e7815b11df6d22042d5f0ac8efcb0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 5 May 2015 13:43:35 +0200 | ||
4 | Subject: [PATCH] configure.ac: don't use dash in m4 macro names | ||
5 | |||
6 | * otherwise it doesn't get expanded and vala-dbus-binding-tool ends with version 'vala-dbus-binding-tool_version' | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | configure.ac | 10 +++++----- | ||
11 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 48f007c..18d0bde 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -1,9 +1,9 @@ | ||
18 | -m4_define([vala-dbus-binding-tool_released], [0]) | ||
19 | -m4_define([vala-dbus-binding-tool_base_version], [1.0]) | ||
20 | -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'])])) | ||
21 | -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])) | ||
22 | +m4_define([vala_dbus_binding_tool_released], [0]) | ||
23 | +m4_define([vala_dbus_binding_tool_base_version], [1.0]) | ||
24 | +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'])])) | ||
25 | +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])) | ||
26 | |||
27 | -AC_INIT([vala-dbus-binding-tool], [vala-dbus-binding-tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) | ||
28 | +AC_INIT([vala-dbus-binding-tool], [vala_dbus_binding_tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) | ||
29 | AC_CONFIG_SRCDIR([src/Makefile.am]) | ||
30 | AC_CONFIG_HEADERS(config.h) | ||
31 | AM_INIT_AUTOMAKE([dist-bzip2]) | ||
32 | -- | ||
33 | 2.3.5 | ||
34 | |||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb index c0c3aa3e7..02a869f2a 100644 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb +++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb | |||
@@ -12,5 +12,7 @@ require vala-dbus-binding-tool.inc | |||
12 | SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12" | 12 | SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12" |
13 | PV = "0.4.0+gitr${SRCPV}" | 13 | PV = "0.4.0+gitr${SRCPV}" |
14 | 14 | ||
15 | SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https" | 15 | SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https \ |
16 | file://0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch \ | ||
17 | " | ||
16 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |