From fbcf61d9d3716dc2e0c2f458e38405ee674afbab Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 27 Aug 2019 14:46:21 -0700 Subject: [PATCH] libredblack: Pass CFLAGS CFLAGS were not being passed. This was breaking builds with ASLR. Pass proper PIC command to gcc with $(fPIC). Don't install static libraries. Keep those for InstallDev only. Signed-off-by: Rosen Penev --- libs/libredblack/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/libredblack/Makefile b/libs/libredblack/Makefile index dcc527eb1..40d32df4d 100644 --- a/libs/libredblack/Makefile +++ b/libs/libredblack/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libredblack PKG_VERSION:=1.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/libredblack @@ -19,8 +19,9 @@ PKG_MAINTAINER:=Mislav Novakovic PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk @@ -37,6 +38,7 @@ define Package/libredblack/description endef CONFIGURE_ARGS += --without-rbgen +CONFIGURE_VARS += lt_cv_prog_cc_pic=$(FPIC) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib @@ -48,7 +50,7 @@ endef define Package/libredblack/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libredblack.{so*,a,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libredblack.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/include $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/redblack.h $(1)/usr/include