diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-11-02 14:37:26 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-11-09 14:33:42 +0100 |
| commit | 7f4cef67c20517e4d5ed11d6e9cd6db0cd0e375b (patch) | |
| tree | a980f425f1b01dba1f311159b99fdad6b6506732 /package/libs | |
| parent | 2ea8cd73fe87afbe15dc552a2f56c32df0b4d469 (diff) | |
| download | upstream-7f4cef67c20517e4d5ed11d6e9cd6db0cd0e375b.tar.gz upstream-7f4cef67c20517e4d5ed11d6e9cd6db0cd0e375b.tar.bz2 upstream-7f4cef67c20517e4d5ed11d6e9cd6db0cd0e375b.zip | |
libevent2: Fix pkgconfig directories
includedir and libdir are set to /usr/include and /usr/lib . This breaks
compilation with packages such as tmux that use pkgconfig to find libevent
Also added PKG_LICENSE_FILES.
Simplified the InstallDev section by using cmake.mk's default rule.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/libs')
| -rw-r--r-- | package/libs/libevent2/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/package/libs/libevent2/Makefile b/package/libs/libevent2/Makefile index 687f1b93a7..b949c9f9d6 100644 --- a/package/libs/libevent2/Makefile +++ b/package/libs/libevent2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libevent2 PKG_VERSION:=2.1.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=libevent-$(PKG_VERSION)-stable.tar.gz PKG_SOURCE_URL:=https://github.com/libevent/libevent/releases/download/release-$(PKG_VERSION)-stable @@ -18,6 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/libevent-$(PKG_VERSION)-stable PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:libevent_project:libevent PKG_CONFIG_DEPENDS:= \ @@ -124,13 +125,9 @@ CMAKE_OPTIONS += \ -DBUILD_TESTING:BOOL=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/libevent*.{a,so}* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libevent*.pc $(1)/usr/lib/pkgconfig/ + $(call Build/InstallDev/cmake,$(1)) + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libevent*.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libevent*.pc endef define Package/libevent2/install |