From 4ac9a2ae8474fc1705506030f82a49fb410a068f Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 11:45:16 +0100 Subject: [PATCH 1/2] libssh2: remove $(FPIC) from TARGET_CFLAGS libssh2 already makes sure that the compiler emits position-independent code. Adding $(FPIC) makes no difference. In addition the libssh2 build system puts its own flag behind the CFLAGS, overriding whatever was set before. Signed-off-by: Sebastian Kemper --- libs/libssh2/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/libssh2/Makefile b/libs/libssh2/Makefile index cdb133cb5..9971659a2 100644 --- a/libs/libssh2/Makefile +++ b/libs/libssh2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libssh2 PKG_VERSION:=1.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.libssh2.org/download @@ -41,8 +41,6 @@ define Package/libssh2/config source "$(SOURCE)/Config.in" endef -TARGET_CFLAGS += $(FPIC) - CONFIGURE_ARGS += \ --disable-examples-build \ --disable-silent-rules \ From 1cce79f006b5a923cb3bb7fe32e5195677e568cc Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 11:49:54 +0100 Subject: [PATCH 2/2] libssh2: update InstallDev define Use $(INSTALL_DATA) for headers and pkgconfig file. Signed-off-by: Sebastian Kemper --- libs/libssh2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libssh2/Makefile b/libs/libssh2/Makefile index 9971659a2..d593c264b 100644 --- a/libs/libssh2/Makefile +++ b/libs/libssh2/Makefile @@ -52,9 +52,9 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libssh2.so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libssh2.pc $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libssh2.pc $(1)/usr/lib/pkgconfig/ endef define Package/libssh2/install