diff mbox

[1/2] vala: fix package suffix

Message ID 20170112133831.12223-1-Vincent.Riera@imgtec.com
State Rejected
Headers show

Commit Message

Vicente Olivert Riera Jan. 12, 2017, 1:38 p.m. UTC
vala executable has a suffix and we reffer to it in our vala wrapper,
but we assume that suffix is always the same as the major version. This
can be wrong, so better to obtain the suffix number from the config.h
file.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/vala/vala.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Petazzoni Jan. 24, 2017, 10:14 a.m. UTC | #1
Hello,

On Thu, 12 Jan 2017 13:38:30 +0000, Vicente Olivert Riera wrote:
> vala executable has a suffix and we reffer to it in our vala wrapper,
> but we assume that suffix is always the same as the major version. This
> can be wrong, so better to obtain the suffix number from the config.h
> file.
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Nope, that is not needed I believe.

Like all Gnome projects, 0.35 is not a stable vala version, so there's
no reason to package it. And I guess that also explains why vala 0.35
still uses 0.34 as the package suffix.

So, by not package a development version, we also don't need this "fix
package suffix" patch.

Best regards,

Thomas
Gustavo Zacarias Jan. 24, 2017, 10:17 a.m. UTC | #2
On 24/01/17 07:14, Thomas Petazzoni wrote:

> Nope, that is not needed I believe.
>
> Like all Gnome projects, 0.35 is not a stable vala version, so there's
> no reason to package it. And I guess that also explains why vala 0.35
> still uses 0.34 as the package suffix.
>
> So, by not package a development version, we also don't need this "fix
> package suffix" patch.
>
> Best regards,
>
> Thomas

Hi All.
Indeed, odd major numbers in the gnome project are development versions, 
like gtk 3.89, glib 2.51 and others.
Regards.
diff mbox

Patch

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index dadfdfc..baa97ab 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -23,7 +23,7 @@  define HOST_VALA_INSTALL_WRAPPER
 		$(HOST_DIR)/usr/bin/vala
 	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
 		$(HOST_DIR)/usr/bin/valac
-	$(SED) 's,@VALA_VERSION@,$(VALA_VERSION_MAJOR),' \
+	$(SED) 's,@VALA_VERSION@,$(shell grep PACKAGE_SUFFIX $(@D)/config.h | grep -o -E "[0-9]+\.[0-9]+"),' \
 		$(HOST_DIR)/usr/bin/vala \
 		$(HOST_DIR)/usr/bin/valac
 endef