From 6a6fb6f8bef22e088346a47067bef6858e85b1ba Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 26 May 2014 16:26:19 +0200
Subject: fix compile

---
 package/uclibc++/Config.in.manual        |  5 ++---
 package/uclibc++/Makefile                |  2 +-
 package/uclibc++/patches/patch-Rules_mak | 12 ++++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 package/uclibc++/patches/patch-Rules_mak

(limited to 'package/uclibc++')

diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual
index 904d4523d..4af136a06 100644
--- a/package/uclibc++/Config.in.manual
+++ b/package/uclibc++/Config.in.manual
@@ -1,11 +1,10 @@
-comment "uClibc++... C++ library for embedded systems (disabled, c++ missing)"
-depends on !ADK_TOOLCHAIN_GCC_CXX
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
 
 config ADK_PACKAGE_UCLIBCXX
 	prompt "uClibc++............. C++ library for embedded systems"
 	tristate
 	depends on ADK_TARGET_LIB_UCLIBC
-	depends on ADK_TOOLCHAIN_GCC_CXX
 	default n
 	help
 	  A standard C++ library for embedded systems
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 78b005a9d..0f00747cd 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		uClibc++
 PKG_VERSION:=		0.2.4
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		394c119363dd8b469fb898442a6764b8
 PKG_DESCR:=		standard c++ library for embedded systems
 PKG_SECTION:=		libs
diff --git a/package/uclibc++/patches/patch-Rules_mak b/package/uclibc++/patches/patch-Rules_mak
new file mode 100644
index 000000000..228483825
--- /dev/null
+++ b/package/uclibc++/patches/patch-Rules_mak
@@ -0,0 +1,12 @@
+--- uClibc++-0.2.4.orig/Rules.mak	2012-05-25 23:15:31.000000000 +0200
++++ uClibc++-0.2.4/Rules.mak	2014-05-26 16:20:39.000000000 +0200
+@@ -79,9 +79,6 @@ check_gcc=$(shell if $(CC) $(1) -S -o /d
+ check_gxx_visibility=$(shell if $(CXX) -fvisibility-inlines-hidden -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
+         then echo "-DGCC_HASCLASSVISIBILITY"; fi)
+ 
+-check_as_needed=$(shell if $(LD) --help | grep -q 'as-needed' ; \
+-	then echo "-Wl,--as-needed -lgcc_s -Wl,--no-as-needed"; else echo "-lgcc_s"; fi)
+-
+ # strip quotes
+ qstrip = $(strip $(subst ",,$(1)))
+ #"))
-- 
cgit v1.2.3