diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:56:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:56:07 +0200 |
| commit | a194f76a6432fb460341066ea5e1848b3d106553 (patch) | |
| tree | 9ba9f38ab132c3562eee87f57ed59977295fa141 | |
| parent | fcae8b3c70e999b3433b22950121972316fb28a7 (diff) | |
fix build for arm targets, from OpenWrt package/uclibc++/patches/patch-include_unwind-cxx_h
| -rw-r--r-- | package/gpsd/patches/patch-Makefile_in.orig | 11 | ||||
| -rw-r--r-- | package/uclibc++/patches/patch-include_unwind-cxx_h | 21 |
2 files changed, 21 insertions, 11 deletions
diff --git a/package/gpsd/patches/patch-Makefile_in.orig b/package/gpsd/patches/patch-Makefile_in.orig deleted file mode 100644 index c70f14c49..000000000 --- a/package/gpsd/patches/patch-Makefile_in.orig +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.92.orig/Makefile.in 2010-03-03 14:49:11.000000000 +0100 -+++ gpsd-2.92/Makefile.in 2010-04-03 10:32:03.332223513 +0200 -@@ -615,8 +615,6 @@ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIB - # - # Build Python binding - # --@HAVE_PYTHON_TRUE@PYEXTENSIONS = gpspacket.so gpslib.so --@HAVE_PYTHON_TRUE@noinst_SCRIPTS = gpspacket.so gpslib.so setup.py - @LIBGPSMM_ENABLE_FALSE@TESTBINS = test_float test_trig test_bits test_packet test_geoid \ - @LIBGPSMM_ENABLE_FALSE@ test_mkgmtime test_json - diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h new file mode 100644 index 000000000..948c127bc --- /dev/null +++ b/package/uclibc++/patches/patch-include_unwind-cxx_h @@ -0,0 +1,21 @@ +patch from OpenWrt +--- 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
|