aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-10-07 16:34:17 +0200
committerPetr Štetiar <ynezz@true.cz>2019-11-06 16:31:42 +0100
commit80a799125bf34b49793e7757e3d08d30030c1b92 (patch)
treeb572583e0b2520ca65ee19ec02e53af93fb05d3b
parentc8c4f7216e31916d50aecaf4585a07652e22cb27 (diff)
downloadupstream-80a799125bf34b49793e7757e3d08d30030c1b92.tar.gz
upstream-80a799125bf34b49793e7757e3d08d30030c1b92.tar.bz2
upstream-80a799125bf34b49793e7757e3d08d30030c1b92.zip
libnl-tiny: update to latest Git head
Includes following changes: 0230d0698e59 add initial GitLab CI support 5e13b797a988 iron out all extra compiler warnings 802fbd4d6f39 cmake: enable extra compiler checks 050bb5c4431b convert into CMake project 5b350e42d1fd refactor into separate Git project and converts the package build to utilize CMake. Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--package/libs/libnl-tiny/Makefile25
1 files changed, 9 insertions, 16 deletions
diff --git a/package/libs/libnl-tiny/Makefile b/package/libs/libnl-tiny/Makefile
index b13d13d3c5..4fde17a365 100644
--- a/package/libs/libnl-tiny/Makefile
+++ b/package/libs/libnl-tiny/Makefile
@@ -12,14 +12,16 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/libnl-tiny.git
-PKG_SOURCE_DATE:=2017-11-16
-PKG_SOURCE_VERSION:=8ee5f3a4023f822d1c916bb2b5e845d3597ac674
-PKG_MIRROR_HASH:=4ec0e67dc3234858da513832906f653e3644a261ac043cbeb95f3a3591daed86
+PKG_SOURCE_DATE:=2019-10-04
+PKG_SOURCE_VERSION:=0230d0698e596ab2e836abd2459d970b14bacb25
+PKG_MIRROR_HASH:=a2543a577a91fbf9ee7fe662a1e2675da1d65d2f56bba8471a2cfe2ddd1cd46a
+CMAKE_INSTALL:=1
PKG_LICENSE:=LGPL-2.1
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
define Package/libnl-tiny
SECTION:=libs
@@ -31,25 +33,16 @@ define Package/libnl-tiny/description
This package contains a stripped down version of libnl
endef
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR)/src \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- all
-endef
-
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(1)/usr/include/libnl-tiny
- $(CP) $(PKG_BUILD_DIR)/src/include/* $(1)/usr/include/libnl-tiny
- $(CP) $(PKG_BUILD_DIR)/src/libnl-tiny.so $(1)/usr/lib/
- $(CP) $(PKG_BUILD_DIR)/files/libnl-tiny.pc $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libnl-tiny/* $(1)/usr/include/libnl-tiny
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnl-tiny.so $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libnl-tiny.pc $(1)/usr/lib/pkgconfig
endef
define Package/libnl-tiny/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_BUILD_DIR)/src/libnl-tiny.so $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnl-tiny.so $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libnl-tiny))