From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 30 Oct 2012 16:57:58 +0000 (+0000)
Subject: [packages] make packages depending on uclibc++ depend on CXX_DEPENDS
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=d846acfe6068b614cf485b889194fd041dc05260;p=packages.git

[packages] make packages depending on uclibc++ depend on CXX_DEPENDS

git-svn-id: svn://svn.openwrt.org/openwrt/packages@34016 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 06c2bafa5..40ad304ec 100644
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/uclibc++.mk
 
 PKG_NAME:=mysql
 PKG_VERSION:=5.1.53
@@ -29,7 +30,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libmysqlclient/Default
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+uclibcxx +zlib
+  DEPENDS:=$(CXX_DEPENDS) +zlib
   TITLE:=MySQL client library
   URL:=http://dev.mysql.com/
 endef
diff --git a/libs/opal/Makefile b/libs/opal/Makefile
index 380a8b297..19ca8c99e 100644
--- a/libs/opal/Makefile
+++ b/libs/opal/Makefile
@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/uclibc++.mk
 
 PKG_NAME:=opal
 PKG_VERSION:=3.2.1
@@ -26,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libopal
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+ptlib +uclibcxx
+  DEPENDS:=+ptlib $(CXX_DEPENDS)
   TITLE:=Open Phone Abstraction Library
   URL:=http://www.opalvoip.org/
 endef
diff --git a/net/rrs/Makefile b/net/rrs/Makefile
index e7d032c8c..efd54f490 100644
--- a/net/rrs/Makefile
+++ b/net/rrs/Makefile
@@ -1,11 +1,12 @@
 #
-# 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:=rrs
 PKG_VERSION:=1.70
@@ -20,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/rrs/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+uclibcxx
+  DEPENDS:=$(CXX_DEPENDS)
   TITLE:=A reverse (connecting) remote shell
   URL:=http://www.cycom.se/dl/rrs/
 endef
diff --git a/net/yate/Makefile b/net/yate/Makefile
index 5c74f290d..27f2c28db 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -7,6 +7,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/uclibc++.mk
 
 RELEASEVER:=3.2.0
 
@@ -33,7 +34,7 @@ endef
 
 define Package/$(PKG_NAME)
   $(call Package/yate/Default)
-  DEPENDS:=+libpthread +uclibcxx
+  DEPENDS:=+libpthread $(CXX_DEPENDS)
   TITLE:=Yet Another Telphony Engine
   MENU:=1
 endef
diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile
index a69ab9334..1fd75d68c 100644
--- a/utils/smartmontools/Makefile
+++ b/utils/smartmontools/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/smartmontools/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+uclibcxx
+  DEPENDS:=$(CXX_DEPENDS)
   TITLE:=S.M.A.R.T Monitoring
   URL:=http://smartmontools.sourceforge.net/
 endef