From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 11 Dec 2012 16:58:10 +0000 (+0000)
Subject: opal: do not build against uclibc++
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=95ae4e41cbb9a1a84f347a1c0e1f5351cc4e91cb;p=openwrt%2Fsvn-archive%2Farchive.git

opal: do not build against uclibc++

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>

SVN-Revision: 34634
---

diff --git a/libs/opal/Makefile b/libs/opal/Makefile
index 19ca8c99e6..80e6e0f764 100644
--- a/libs/opal/Makefile
+++ b/libs/opal/Makefile
@@ -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.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/uclibc++.mk
 
 PKG_NAME:=opal
 PKG_VERSION:=3.2.1
@@ -18,16 +17,12 @@ PKG_MD5SUM:=405ba3b03ec706b6e6f873de340937e2
 
 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
 
 define Package/libopal
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+ptlib $(CXX_DEPENDS)
+  DEPENDS:=+ptlib +libstdcpp
   TITLE:=Open Phone Abstraction Library
   URL:=http://www.opalvoip.org/
 endef
@@ -56,11 +51,15 @@ CONFIGURE_ARGS += \
 	--enable-localgsm
 
 CONFIGURE_VARS += \
-	CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \
+	PTLIBDIR="$(BUILD_DIR)/ptlib" \
+	PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/"
+	CXXFLAGS="$(TARGET_CFLAGS)" \
 
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CCFLAGS="$(TARGET_CFLAGS)" \
+	PTLIBDIR="$(BUILD_DIR)/ptlib" \
+	PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" \
 	optnoshared
 
 define Build/InstallDev