From 4b8138c8a8497070465a9226cf374cbee869d415 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 2 Apr 2021 16:35:44 -0700 Subject: [PATCH] libmaxminddb: build with CMake Faster and less error prone. Small cleanups. Signed-off-by: Rosen Penev --- libs/libmaxminddb/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/libmaxminddb/Makefile b/libs/libmaxminddb/Makefile index 08f54f416..675bfec13 100644 --- a/libs/libmaxminddb/Makefile +++ b/libs/libmaxminddb/Makefile @@ -9,21 +9,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmaxminddb PKG_VERSION:=1.5.2 -PKG_RELEASE=1 +PKG_RELEASE=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/maxmind/libmaxminddb/releases/download/$(PKG_VERSION)/ PKG_HASH:=5237076d250a5f7c297e331c35a433eeaaf0dc205e070e4db353c9ba10f340a2 -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 +PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jan Pavlinec - include $(INCLUDE_DIR)/package.mk +include ../../devel/ninja/ninja-cmake.mk define Package/libmaxminddb SECTION:=libs @@ -36,11 +33,15 @@ define Package/libmaxminddb/description The libmaxminddb library provides functions for working MaxMind DB files. endef +CMAKE_OPTIONS += \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_TESTING=OFF + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmaxminddb.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmaxminddb.so* $(1)/usr/lib/ endef define Package/libmaxminddb/install