[packages] gnuplot libc++ fix

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32979 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2012-08-04 17:02:06 +00:00
parent bc19341c7a
commit 3418bbccc4

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gnuplot PKG_NAME:=gnuplot
PKG_VERSION:=4.6.0 PKG_VERSION:=4.6.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -17,6 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/gnuplot PKG_SOURCE_URL:=@SF/gnuplot
PKG_MD5SUM:=8e6e92b4596ea0eb75e16a57fc79efec PKG_MD5SUM:=8e6e92b4596ea0eb75e16a57fc79efec
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
@ -24,14 +25,13 @@ TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ LIBS="-lpthread"
LIBS="-nodefaultlibs -lc -luClibc++ -lpthread $(LIBGCC_S)"
define Package/gnuplot define Package/gnuplot
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libncurses +uclibcxx +zlib +libpng +libfreetype +libgd \ DEPENDS:=+libncurses $(CXX_DEPENDS) +zlib +libpng +libfreetype +libgd \
$(INTL_DEPENDS) $(ICONV_DEPENDS) +libpthread +libreadline $(INTL_DEPENDS) $(ICONV_DEPENDS) +libpthread +libreadline
TITLE:=A portable command-line driven graphing utility TITLE:=A portable command-line driven graphing utility
URL:=http://sourceforge.net/projects/gnuplot/ URL:=http://sourceforge.net/projects/gnuplot/