[packages] znc libc++ fix
git-svn-id: svn://svn.openwrt.org/openwrt/packages@32970 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
cb5e8f170a
commit
ab2bb1a557
@ -30,7 +30,7 @@ endef
|
|||||||
|
|
||||||
define Package/znc
|
define Package/znc
|
||||||
$(Package/znc/default)
|
$(Package/znc/default)
|
||||||
DEPENDS:=+libopenssl +uclibcxx
|
DEPENDS:=+libopenssl $(CXX_DEPENDS)
|
||||||
MENU:=1
|
MENU:=1
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@ -263,10 +263,10 @@ $(eval $(call webskin,ice))
|
|||||||
|
|
||||||
PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES))
|
PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES))
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/uclibc++.mk
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
CONFIGURE_VARS += \
|
CONFIGURE_VARS += \
|
||||||
CXX="$(STAGING_DIR)/host/bin/g++-uc" \
|
|
||||||
CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
|
CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
|
||||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
|
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
|
||||||
LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
|
LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
|
||||||
@ -277,9 +277,6 @@ CONFIGURE_ARGS += \
|
|||||||
--enable-extra \
|
--enable-extra \
|
||||||
--disable-perl
|
--disable-perl
|
||||||
|
|
||||||
MAKE_FLAGS += \
|
|
||||||
CXX="$(STAGING_DIR)/host/bin/g++-uc"
|
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
$(call Build/Configure/Default,)
|
$(call Build/Configure/Default,)
|
||||||
$(call libtool_disable_rpath)
|
$(call libtool_disable_rpath)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user