diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-08 11:24:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-08 11:24:12 +0000 |
| commit | 48db59fab785ce881e154d83115de86d284fce5d (patch) | |
| tree | 8741bab5dbcca43c884cdf0788b6c0049e0c25d1 /package/libs/uclibc++/patches | |
| parent | 997ace7e5e78d580d802f3f30ddc00f9b30e0bcc (diff) | |
| download | upstream-48db59fab785ce881e154d83115de86d284fce5d.tar.gz upstream-48db59fab785ce881e154d83115de86d284fce5d.tar.bz2 upstream-48db59fab785ce881e154d83115de86d284fce5d.zip | |
move library packages to package/libs/
SVN-Revision: 33657
Diffstat (limited to 'package/libs/uclibc++/patches')
| -rw-r--r-- | package/libs/uclibc++/patches/002-path_to_bash.patch | 11 | ||||
| -rw-r--r-- | package/libs/uclibc++/patches/006-eabi_fix.patch | 38 |
2 files changed, 49 insertions, 0 deletions
diff --git a/package/libs/uclibc++/patches/002-path_to_bash.patch b/package/libs/uclibc++/patches/002-path_to_bash.patch new file mode 100644 index 0000000000..26d88ee4dd --- /dev/null +++ b/package/libs/uclibc++/patches/002-path_to_bash.patch @@ -0,0 +1,11 @@ +--- a/bin/Makefile ++++ b/bin/Makefile +@@ -13,7 +13,7 @@ install: + $(INSTALL) -m 755 $(WRAPPER) $(PREFIX)$(UCLIBCXX_RUNTIME_BINDIR) + + $(WRAPPER): Makefile +- echo '#!/bin/sh' > $@ ++ echo '#!/usr/bin/env bash' > $@ + echo '' >> $@ + echo 'WRAPPER_INCLUDEDIR="$${WRAPPER_INCLUDEDIR:=-I$(UCLIBCXX_RUNTIME_INCLUDEDIR)}"' >> $@ + echo 'WRAPPER_LIBDIR="$${WRAPPER_LIBDIR:=-L$(UCLIBCXX_RUNTIME_LIBDIR)}"' >> $@ diff --git a/package/libs/uclibc++/patches/006-eabi_fix.patch b/package/libs/uclibc++/patches/006-eabi_fix.patch new file mode 100644 index 0000000000..893c2d60b6 --- /dev/null +++ b/package/libs/uclibc++/patches/006-eabi_fix.patch @@ -0,0 +1,38 @@ +--- a/include/typeinfo ++++ b/include/typeinfo +@@ -44,6 +44,7 @@ namespace __cxxabiv1 + class __class_type_info; + } // namespace __cxxabiv1 + ++#ifndef __GXX_MERGED_TYPEINFO_NAMES + #if !__GXX_WEAK__ + // If weak symbols are not supported, typeinfo names are not merged. + #define __GXX_MERGED_TYPEINFO_NAMES 0 +@@ -51,6 +52,7 @@ namespace __cxxabiv1 + // On platforms that support weak symbols, typeinfo names are merged. + #define __GXX_MERGED_TYPEINFO_NAMES 1 + #endif ++#endif + + namespace std + { +--- a/include/unwind-cxx.h ++++ b/include/unwind-cxx.h +@@ -173,6 +173,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') +@@ -181,6 +182,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 |