bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opal: do not build against uclibc++

Browse Source 
Neither g++-uc nor g++-uc+std prove to properly build opal, so just
fallback to the standard g++ and libstdc++ build.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@34634 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-12-11 16:58:10 +00:00
parent 763b27cba4
commit 3301c199c8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/opal/Makefile
View File

@ -1,12 +1,11 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/uclibc++.mk
PKG_NAME:=opal PKG_NAME:=opal
PKG_VERSION:=3.2.1 PKG_VERSION:=3.2.1
@ -18,16 +17,12 @@ PKG_MD5SUM:=405ba3b03ec706b6e6f873de340937e2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
# Set location of ptlib (Which needs to have been built already)
export PTLIBDIR=$(BUILD_DIR)/ptlib
export PTLIBPLUGINDIR=$(BUILD_DIR)/ptlib/plugins/ptlib/
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/libopal define Package/libopal
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+ptlib $(CXX_DEPENDS) DEPENDS:=+ptlib +libstdcpp
TITLE:=Open Phone Abstraction Library TITLE:=Open Phone Abstraction Library
URL:=http://www.opalvoip.org/ URL:=http://www.opalvoip.org/
endef endef
@ -56,11 +51,15 @@ CONFIGURE_ARGS += \
--enable-localgsm --enable-localgsm
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \ PTLIBDIR="$(BUILD_DIR)/ptlib" \
PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/"
CXXFLAGS="$(TARGET_CFLAGS)" \
MAKE_FLAGS += \ MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CCFLAGS="$(TARGET_CFLAGS)" \ CCFLAGS="$(TARGET_CFLAGS)" \
PTLIBDIR="$(BUILD_DIR)/ptlib" \
PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" \
optnoshared optnoshared
define Build/InstallDev define Build/InstallDev