From 65d5a6e183292c01da71d1e6e291c47e19f7b650 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Mon, 10 Dec 2018 00:22:15 -0200 Subject: [PATCH] libgee: use unversioned vala dir, misc fixes Copy vapi files to unversioned vala dir. Added vala/host to PKG_BUILD_DEPENDS. Removed TARGET_LDFLAGS Removed copyright lines Signed-off-by: Eneas U de Queiroz (cherry-picked from 2cf76d52780d352b2ecb4bf14cb5eb403ef5144d) --- libs/libgee/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile index 27b353c166..66da87fd55 100644 --- a/libs/libgee/Makefile +++ b/libs/libgee/Makefile @@ -1,6 +1,4 @@ # -# Copyright (C) 2009-2015 OpenWrt.org -# # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -9,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgee PKG_VERSION:=0.18.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=W. Michael Petullo @@ -23,12 +21,11 @@ PKG_MD5SUM:=29ea6125e653d7e60b49a9a9544abc96 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=vala/host + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - define Package/libgee SECTION:=libs CATEGORY:=Libraries @@ -57,10 +54,10 @@ define Build/InstallDev $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ $(1)/usr/lib/pkgconfig/ - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/vala-0.30/vapi/ + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/vala/vapi/ $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/share/vala/vapi/* \ - $(STAGING_DIR_HOSTPKG)/share/vala-0.30/vapi + $(STAGING_DIR_HOSTPKG)/share/vala/vapi endef define Package/libgee/install -- 2.30.2