From bfedaf5f48565b50129f957de30bcc96c50ac311 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 7 Dec 2020 18:34:17 -0800 Subject: [PATCH] libmcrypt: install libmcrypt-config to host Helps to fix old packages that don't use pkgconfig. Cleaned up Makefile: Added PKG_BUILD_PARALLEL for faster compilation. Fixed license information. Some minor cleanups for consistency between packages. Fixed host paths. Signed-off-by: Rosen Penev --- libs/libmcrypt/Makefile | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile index a160620ce6..ef70444175 100644 --- a/libs/libmcrypt/Makefile +++ b/libs/libmcrypt/Makefile @@ -11,23 +11,20 @@ PKG_NAME:=libmcrypt PKG_VERSION:=2.5.8 PKG_RELEASE:=2 -PKG_MAINTAINER:=W. Michael Petullo - -PKG_LICENSE:=LGPLv2.1 -PKG_LICENSE_FILES:=COPYING.LIB -PKG_CPE_ID:=cpe:/a:mcrypt:libmcrypt - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/mcrypt PKG_HASH:=bf2f1671f44af88e66477db0982d5ecb5116a5c767b0a0d68acb34499d41b793 -PKG_FIXUP:=autoreconf +PKG_MAINTAINER:=W. Michael Petullo +PKG_LICENSE:=LGPL-2.1-or-later +PKG_LICENSE_FILES:=COPYING.LIB +PKG_CPE_ID:=cpe:/a:mcrypt:libmcrypt + PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -TARGET_CFLAGS += $(FPIC) - define Package/libmcrypt SECTION:=libs CATEGORY:=Libraries @@ -40,12 +37,11 @@ define Package/libmcrypt/description together a variety of ciphers for convenient use. endef -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - ) -endef +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static + +TARGET_CFLAGS += $(FPIC) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include @@ -54,8 +50,9 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(1)/usr/bin/ - $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libmcrypt-config - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libmcrypt-config + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libmcrypt-config + $(INSTALL_DIR) $(2)/bin + $(LN) ../../usr/bin/libmcrypt-config $(2)/bin/libmcrypt-config endef define Package/libmcrypt/install