From 9184ea3d9bba3df099f488ee7da517c24c427891 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 5 Sep 2019 15:02:11 -0700 Subject: [PATCH] vala: Update to 0.46.0 Switched to using the configure script instead of using make directly. Added HOST__BUILD_PARALLEL for faster compilation. Removed target build. It's completely unused. Signed-off-by: Rosen Penev --- lang/vala/Makefile | 75 ++++++++++------------------------------------ 1 file changed, 15 insertions(+), 60 deletions(-) diff --git a/lang/vala/Makefile b/lang/vala/Makefile index bce9f27ec..a135daac6 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -8,86 +8,41 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vala -PKG_VERSION:=0.34.18 +PKG_VERSION:=0.46.0 PKG_RELEASE:=1 -PKG_LICENSE:=LGPL-2.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNOME/vala/0.34 -PKG_HASH:=b89044c6eb70556ca2486812a42983944b4f6ef18db66b5af1a9006de11b1cd2 +PKG_SOURCE_URL:=@GNOME/vala/0.46 +PKG_HASH:=a10a3b9d60bdfe3349afd3778cd4518b1eb517b59134a70ab5ac845432220c17 + +PKG_MAINTAINER:=Gergely Kiss +PKG_LICENSE:=LGPL-2.1-or-later +PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=glib2 glib2/host vala/host HOST_BUILD_DEPENDS:=glib2/host +HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/host-build.mk -TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - define Package/vala SECTION:=lang CATEGORY:=Languages TITLE:=C-sharp like language for the GObject system URL:=https://wiki.gnome.org/Projects/Vala - MAINTAINER:=Gergely Kiss - DEPENDS:=+glib2 +libpthread endef define Package/vala/description -Vala is a C-sharp like language for the GObject system. This package contains -the Vala-to-C compiler. -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef - -define Build/InstallDev - $(INSTALL_DIR) \ - $(1)/usr/share/vala-0.34/vapi \ - $(1)/usr/lib \ - $(1)/usr/lib/pkgconfig - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/vala-0.34/vapi/* \ - $(1)/usr/share/vala-0.34/vapi - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libvala-0.34.{so*,la} \ - $(1)/usr/lib - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ - $(1)/usr/lib/pkgconfig + Vala is a C-sharp like language for the GObject system. This package contains + the Vala-to-C compiler for host. endef -define Package/vala/install - $(INSTALL_DIR) \ - $(1)/usr/share/vala-0.34/vapi \ - $(1)/usr/lib \ - $(1)/usr/lib/pkgconfig \ - $(1)/usr/bin - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/vala-0.34/vapi/* \ - $(1)/usr/share/vala-0.34/vapi - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libvala-0.34.{so*,la} \ - $(1)/usr/lib - - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.34,valac,valac-0.34,vapicheck,vapicheck-0.34,vapigen,vapigen-0.34,vala-gen-introspect,vala-gen-introspect-0.34} \ - $(1)/usr/bin - - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ - $(1)/usr/lib/pkgconfig -endef +HOST_CONFIGURE_ARGS += \ + --disable-coverage \ + --disable-debug \ + --disable-valadoc \ + --without-cgraph $(eval $(call HostBuild)) $(eval $(call BuildPackage,vala))