Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 14 years ago
parent
commit
1cb3ea6a57
2 changed files with 22 additions and 20 deletions
  1. 2 0
      Config.in
  2. 20 20
      package/uclibc++/patches/patch-include_unwind-cxx_h

+ 2 - 0
Config.in

@@ -33,11 +33,13 @@ config ADK_DEVELSYSTEM
 	bool "Compile a ADK development system"
 	default n
 	select BUSYBOX_CMP
+	select BUSYBOX_COMM
 	select BUSYBOX_EXPR
 	select BUSYBOX_INSTALL
 	select BUSYBOX_MKTEMP
 	select BUSYBOX_UNZIP
 	select BUSYBOX_RMDIR
+	select BUSYBOX_SPLIT
 	select BUSYBOX_TAC
 	select BUSYBOX_TEE
 	select BUSYBOX_WGET

+ 20 - 20
package/uclibc++/patches/patch-include_unwind-cxx_h

@@ -1,21 +1,21 @@
-patch from OpenWrt
+diff -Nur uClibc++-0.2.2.orig/include/unwind-cxx.h uClibc++-0.2.2/include/unwind-cxx.h
 --- uClibc++-0.2.2.orig/include/unwind-cxx.h	2007-06-04 00:51:12.000000000 +0200
-+++ uClibc++-0.2.2/include/unwind-cxx.h	2010-04-02 12:44:02.704723285 +0200
-@@ -135,6 +135,7 @@ extern std::unexpected_handler __unexpec
- 
- // This is the exception class we report -- "GNUCC++\0".
- const _Unwind_Exception_Class __gxx_exception_class
-+#ifndef __ARM_EABI_UNWINDER__
- = ((((((((_Unwind_Exception_Class) 'G' 
- 	 << 8 | (_Unwind_Exception_Class) 'N')
- 	<< 8 | (_Unwind_Exception_Class) 'U')
-@@ -143,6 +144,9 @@ const _Unwind_Exception_Class __gxx_exce
-      << 8 | (_Unwind_Exception_Class) '+')
-     << 8 | (_Unwind_Exception_Class) '+')
-    << 8 | (_Unwind_Exception_Class) '\0');
-+#else
-+= "GNUC++";
-+#endif
- 
- // GNU C++ personality routine, Version 0.
- extern "C" _Unwind_Reason_Code __gxx_personality_v0
++++ uClibc++-0.2.2/include/unwind-cxx.h	2010-07-20 11:43:58.726496262 +0200
+@@ -134,6 +134,7 @@
+ // These are explicitly GNU C++ specific.
+ 
+ // This is the exception class we report -- "GNUCC++\0".
++#ifndef __ARM_EABI_UNWINDER__
+ const _Unwind_Exception_Class __gxx_exception_class
+ = ((((((((_Unwind_Exception_Class) 'G' 
+ 	 << 8 | (_Unwind_Exception_Class) 'N')
+@@ -143,6 +144,9 @@
+      << 8 | (_Unwind_Exception_Class) '+')
+     << 8 | (_Unwind_Exception_Class) '+')
+    << 8 | (_Unwind_Exception_Class) '\0');
++#else
++= "GNUC++";
++#endif
+ 
+ // GNU C++ personality routine, Version 0.
+ extern "C" _Unwind_Reason_Code __gxx_personality_v0