diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-07-19 13:34:45 -0700 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2020-08-11 21:29:44 +0200 |
| commit | b59a98b009b9c2453f121bcbd29252ad21128a9c (patch) | |
| tree | e593fc8fb6c68a837231881ea287c4205804375a | |
| parent | 5e512cc9c1a441f5444ac05b666fec15faff9110 (diff) | |
| download | upstream-b59a98b009b9c2453f121bcbd29252ad21128a9c.tar.gz upstream-b59a98b009b9c2453f121bcbd29252ad21128a9c.tar.bz2 upstream-b59a98b009b9c2453f121bcbd29252ad21128a9c.zip | |
libjson-c: fix pkgconfig file
The pkgconfig file references the host directories, not the openwrt
ones. Used SED to fix as is done elsewhere. Removed CMAKE_INSTALL as a
result.
Removed now pointless CFLAGS.
Added PKG_BUILD_PARALLEL for faster compilation.
Various rearrangements for consistency between packages.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | package/libs/libjson-c/Makefile | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile index 5e88bba9a3..84bd722f15 100644 --- a/package/libs/libjson-c/Makefile +++ b/package/libs/libjson-c/Makefile @@ -9,29 +9,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:=json-c PKG_VERSION:=0.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/ PKG_HASH:=99914e644a25201d82ccefa20430f7515c110923360f9ef46755527c02412afa +PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:json-c_project:json-c -CMAKE_INSTALL:=1 -CMAKE_OPTIONS += -DCMAKE_INSTALL_INCLUDEDIR=$(STAGING_DIR)/usr/include - -PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> +PKG_BUILD_PARALLEL:=1 +HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk -TARGET_CFLAGS += $(FPIC) -Wno-implicit-fallthrough -HOST_CFLAGS += -Wno-implicit-fallthrough -HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) - define Package/libjson-c SECTION:=libs CATEGORY:=Libraries @@ -44,6 +39,12 @@ define Package/libjson-c/description This package contains a library for javascript object notation backends. endef +define Build/InstallDev + $(call Build/InstallDev/cmake,$(1)) + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/json-c.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/json-c.pc +endef + define Package/libjson-c/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.so.* $(1)/usr/lib/ |