EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nghttp2: Fix pkgconfig file

Browse Source 
lib and includedir point to the host, not staging_dir.

Note that prefix and exec_prefix is overriden to point to staging_dir.

As CMAKE_INSTTALL is passed, switched InstallDev to use cmake.mk's rule.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-11-02 19:54:04 -07:00 committed by Hauke Mehrtens
parent 7f4cef67c2
commit cabaaf06fe
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/libs/nghttp2/Makefile
View File

@ -2,9 +2,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nghttp2 PKG_NAME:=nghttp2
PKG_VERSION:=1.39.2 PKG_VERSION:=1.39.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION)
PKG_HASH:=a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b PKG_HASH:=a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b
@ -31,11 +31,9 @@ CMAKE_OPTIONS += \
-DENABLE_LIB_ONLY=ON -DENABLE_LIB_ONLY=ON
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/nghttp2 $(call Build/InstallDev/cmake,$(1))
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/nghttp2/*.h $(1)/usr/include/nghttp2/ $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libnghttp2.pc
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libnghttp2.pc
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnghttp2.so* $(1)/usr/lib/
endef endef
define Package/libnghttp2/install define Package/libnghttp2/install