diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-01 12:19:57 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-08-02 00:51:15 -0700 |
| commit | f21c3b4e99533a054b417f18b2eeb1ca85b83f84 (patch) | |
| tree | 480ed0c91cb5b3bb457074ffc400d9081d3e4cf9 /libs/nlohmannjson | |
| parent | 95698aa083cea971d8923ac57d09ce70af0d109c (diff) | |
nlohmannjson: build with meson
Just blindly copying the include files is not quite correct. The build
system merges all of them into one file.
A pkgconfig file also gets generated.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs/nlohmannjson')
| -rw-r--r-- | libs/nlohmannjson/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libs/nlohmannjson/Makefile b/libs/nlohmannjson/Makefile index 08261c882..973bb63d6 100644 --- a/libs/nlohmannjson/Makefile +++ b/libs/nlohmannjson/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nlohmannjson PKG_VERSION:=3.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=json-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://codeload.github.com/nlohmann/json/zip/v$(PKG_VERSION)? @@ -17,7 +17,11 @@ PKG_MAINTAINER:=Leonid Esman <leonid.esman@gmail.com> PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.MIT +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=meson/host + include $(INCLUDE_DIR)/package.mk +include ../../devel/meson/meson.mk define Package/nlohmannjson SECTION:=libs @@ -32,8 +36,10 @@ define Package/nlohmannjson/description endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/include/nlohmann $(1)/usr/include + $(INSTALL_DIR) $(1)/usr/include/nlohmann + $(CP) $(PKG_INSTALL_DIR)/usr/include/nlohmann/json.hpp $(1)/usr/include/nlohmann + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/nlohmann_json.pc $(1)/usr/lib/pkgconfig endef $(eval $(call BuildPackage,nlohmannjson)) |