Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

smartmontools: Fix build with CONFIG_USE_LIBSTDCXX

Browse source 
The Makefile would still force the use of and linking against uClibc++
even though libstdc++ may have been chosen, which would result in the
package depending on libstdcpp ($(CXX_DEPENDS) but we would still be
missing an libuClibc++ library depdency.

Fix this by looking at CONFIG_USE_UCLIBCXX to adjust the configure
script variables.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2017-06-05 18:16:41 -07:00
parent 140b3f2fe0
commit 482499b60b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/smartmontools/Makefile
View file

@ -55,13 +55,17 @@ define Package/smartd/description
ATA and SCSI disks. It is derived from smartsuite. ATA and SCSI disks. It is derived from smartsuite.
endef endef
# uses GNU configure ifeq ($(CONFIG_USE_UCLIBCXX),y)
UCXXCFLAGS:=-fno-builtin -fno-rtti -nostdinc++
UCXXCPPFLAGS:=-I$(STAGING_DIR)/usr/include/uClibc++
UCXXLIBS:=-nodefaultlibs -lc -luClibc++
endif
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CXXFLAGS="$$$$CXXFLAGS $(UCXXCFLAGS)" \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ CPPFLAGS="$$$$CPPFLAGS $(UCXXCPPFLAGS) -I$(LINUX_DIR)/include" \
LDFLAGS="$$$$LDFLAGS" \ LDFLAGS="$$$$LDFLAGS" \
LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S) -lc" \ LIBS="$(UCXXLIBS) -lm $(LIBGCC_S) -lc" \
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \