mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-27 07:23:30 +08:00
Update stlport patch
This commit is contained in:
Eric Andersen
parent
8d4ef78e41
commit
b885ae776f
@ -1,6 +1,6 @@
|
||||
diff -urN STLport-4.5.3.orig/Makefile STLport-4.5.3/Makefile
|
||||
--- STLport-4.5.3.orig/Makefile Wed Dec 31 17:00:00 1969
|
||||
+++ STLport-4.5.3/Makefile Mon Sep 9 04:01:16 2002
|
||||
diff -urN STLport-4.5.3/Makefile STLport-4.5.3-devel/Makefile
|
||||
--- STLport-4.5.3/Makefile Wed Dec 31 17:00:00 1969
|
||||
+++ STLport-4.5.3-devel/Makefile Tue Jan 7 15:28:08 2003
|
||||
@@ -0,0 +1,44 @@
|
||||
+# Makefile to compile stlport with uClibc
|
||||
+#
|
||||
@ -45,10 +45,10 @@ diff -urN STLport-4.5.3.orig/Makefile STLport-4.5.3/Makefile
|
||||
+ (cd lib; \
|
||||
+ cp -a libstdc++.a $(PREFIX)/lib; \
|
||||
+ cp -a libstdc++.so libstdc++.so.0 libstdc++.so.4.5 $(PREFIX)/lib;)
|
||||
+ cp -a stlport $(PREFIX)/include/g++-v3
|
||||
diff -urN STLport-4.5.3.orig/src/dll_main.cpp STLport-4.5.3/src/dll_main.cpp
|
||||
--- STLport-4.5.3.orig/src/dll_main.cpp Sat Feb 2 16:11:56 2002
|
||||
+++ STLport-4.5.3/src/dll_main.cpp Mon Sep 9 03:55:09 2002
|
||||
+ cp -a stlport $(PREFIX)/include/c++
|
||||
diff -urN STLport-4.5.3/src/dll_main.cpp STLport-4.5.3-devel/src/dll_main.cpp
|
||||
--- STLport-4.5.3/src/dll_main.cpp Sat Feb 2 16:11:56 2002
|
||||
+++ STLport-4.5.3-devel/src/dll_main.cpp Tue Jan 7 15:28:08 2003
|
||||
@@ -52,7 +52,7 @@
|
||||
# include <locale>
|
||||
# endif
|
||||
@ -58,9 +58,9 @@ diff -urN STLport-4.5.3.orig/src/dll_main.cpp STLport-4.5.3/src/dll_main.cpp
|
||||
# define _STLP_HAS_PERTHREAD_ALLOCATOR
|
||||
# include <stl/_pthread_alloc.h>
|
||||
# endif
|
||||
diff -urN STLport-4.5.3.orig/src/gcc-uClibc.mak STLport-4.5.3/src/gcc-uClibc.mak
|
||||
--- STLport-4.5.3.orig/src/gcc-uClibc.mak Wed Dec 31 17:00:00 1969
|
||||
+++ STLport-4.5.3/src/gcc-uClibc.mak Mon Sep 9 04:04:29 2002
|
||||
diff -urN STLport-4.5.3/src/gcc-uClibc.mak STLport-4.5.3-devel/src/gcc-uClibc.mak
|
||||
--- STLport-4.5.3/src/gcc-uClibc.mak Wed Dec 31 17:00:00 1969
|
||||
+++ STLport-4.5.3-devel/src/gcc-uClibc.mak Tue Jan 7 15:28:08 2003
|
||||
@@ -0,0 +1,61 @@
|
||||
+#
|
||||
+# Basename for libraries
|
||||
@ -123,9 +123,9 @@ diff -urN STLport-4.5.3.orig/src/gcc-uClibc.mak STLport-4.5.3/src/gcc-uClibc.mak
|
||||
+# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
|
||||
+
|
||||
+
|
||||
diff -urN STLport-4.5.3.orig/src/num_put_float.cpp STLport-4.5.3/src/num_put_float.cpp
|
||||
--- STLport-4.5.3.orig/src/num_put_float.cpp Fri Jan 18 15:06:52 2002
|
||||
+++ STLport-4.5.3/src/num_put_float.cpp Mon Sep 9 03:23:53 2002
|
||||
diff -urN STLport-4.5.3/src/num_put_float.cpp STLport-4.5.3-devel/src/num_put_float.cpp
|
||||
--- STLport-4.5.3/src/num_put_float.cpp Fri Jan 18 15:06:52 2002
|
||||
+++ STLport-4.5.3-devel/src/num_put_float.cpp Tue Jan 7 15:28:08 2003
|
||||
@@ -65,6 +65,12 @@
|
||||
|
||||
# endif
|
||||
@ -166,9 +166,9 @@ diff -urN STLport-4.5.3.orig/src/num_put_float.cpp STLport-4.5.3/src/num_put_flo
|
||||
inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
|
||||
{ return buf + ecvt_r(x, n, pt, sign, buf, NDIG+2); }
|
||||
inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
|
||||
diff -urN STLport-4.5.3.orig/src/stdio_streambuf.cpp STLport-4.5.3/src/stdio_streambuf.cpp
|
||||
--- STLport-4.5.3.orig/src/stdio_streambuf.cpp Thu Jan 10 11:41:52 2002
|
||||
+++ STLport-4.5.3/src/stdio_streambuf.cpp Mon Sep 9 02:11:00 2002
|
||||
diff -urN STLport-4.5.3/src/stdio_streambuf.cpp STLport-4.5.3-devel/src/stdio_streambuf.cpp
|
||||
--- STLport-4.5.3/src/stdio_streambuf.cpp Thu Jan 10 11:41:52 2002
|
||||
+++ STLport-4.5.3-devel/src/stdio_streambuf.cpp Tue Jan 7 15:28:08 2003
|
||||
@@ -82,7 +82,7 @@
|
||||
_STLP_VENDOR_CSTD::fgetpos(_M_file, &pos);
|
||||
// added 21 june 00 mdb,rjf,wjs: glibc 2.2 changed fpos_t to be a struct instead
|
||||
@ -196,9 +196,9 @@ diff -urN STLport-4.5.3.orig/src/stdio_streambuf.cpp STLport-4.5.3/src/stdio_str
|
||||
#else
|
||||
fpos_t p(pos);
|
||||
#endif
|
||||
diff -urN STLport-4.5.3.orig/stlport/config/_prolog.h STLport-4.5.3/stlport/config/_prolog.h
|
||||
--- STLport-4.5.3.orig/stlport/config/_prolog.h Sun Oct 28 13:26:44 2001
|
||||
+++ STLport-4.5.3/stlport/config/_prolog.h Mon Sep 9 02:43:42 2002
|
||||
diff -urN STLport-4.5.3/stlport/config/_prolog.h STLport-4.5.3-devel/stlport/config/_prolog.h
|
||||
--- STLport-4.5.3/stlport/config/_prolog.h Sun Oct 28 13:26:44 2001
|
||||
+++ STLport-4.5.3-devel/stlport/config/_prolog.h Tue Jan 7 15:28:08 2003
|
||||
@@ -1,3 +1,8 @@
|
||||
+/* Evil hack to make sure everything behaves itself */
|
||||
+#define _STLP_USE_UCLIBC
|
||||
@ -208,9 +208,9 @@ diff -urN STLport-4.5.3.orig/stlport/config/_prolog.h STLport-4.5.3/stlport/conf
|
||||
|
||||
#if defined (_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__)
|
||||
|
||||
diff -urN STLport-4.5.3.orig/stlport/config/stl_gcc.h STLport-4.5.3/stlport/config/stl_gcc.h
|
||||
--- STLport-4.5.3.orig/stlport/config/stl_gcc.h Thu Jan 10 11:41:58 2002
|
||||
+++ STLport-4.5.3/stlport/config/stl_gcc.h Mon Sep 9 02:11:00 2002
|
||||
diff -urN STLport-4.5.3/stlport/config/stl_gcc.h STLport-4.5.3-devel/stlport/config/stl_gcc.h
|
||||
--- STLport-4.5.3/stlport/config/stl_gcc.h Thu Jan 10 11:41:58 2002
|
||||
+++ STLport-4.5.3-devel/stlport/config/stl_gcc.h Tue Jan 7 15:28:08 2003
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
@ -220,9 +220,9 @@ diff -urN STLport-4.5.3.orig/stlport/config/stl_gcc.h STLport-4.5.3/stlport/conf
|
||||
# define _STLP_USE_GLIBC
|
||||
#endif
|
||||
|
||||
diff -urN STLport-4.5.3.orig/stlport/cstdlib STLport-4.5.3/stlport/cstdlib
|
||||
--- STLport-4.5.3.orig/stlport/cstdlib Thu Aug 23 15:51:54 2001
|
||||
+++ STLport-4.5.3/stlport/cstdlib Mon Sep 9 02:11:00 2002
|
||||
diff -urN STLport-4.5.3/stlport/cstdlib STLport-4.5.3-devel/stlport/cstdlib
|
||||
--- STLport-4.5.3/stlport/cstdlib Thu Aug 23 15:51:54 2001
|
||||
+++ STLport-4.5.3-devel/stlport/cstdlib Tue Jan 7 15:28:08 2003
|
||||
@@ -55,9 +55,11 @@
|
||||
using _STLP_VENDOR_CSTD::atof;
|
||||
using _STLP_VENDOR_CSTD::atoi;
|
||||
@ -235,9 +235,9 @@ diff -urN STLport-4.5.3.orig/stlport/cstdlib STLport-4.5.3/stlport/cstdlib
|
||||
using _STLP_VENDOR_CSTD::strtod;
|
||||
using _STLP_VENDOR_CSTD::strtol;
|
||||
using _STLP_VENDOR_CSTD::strtoul;
|
||||
diff -urN STLport-4.5.3.orig/stlport/stl/_config.h STLport-4.5.3/stlport/stl/_config.h
|
||||
--- STLport-4.5.3.orig/stlport/stl/_config.h Fri Jan 18 15:08:36 2002
|
||||
+++ STLport-4.5.3/stlport/stl/_config.h Mon Sep 9 04:14:36 2002
|
||||
diff -urN STLport-4.5.3/stlport/stl/_config.h STLport-4.5.3-devel/stlport/stl/_config.h
|
||||
--- STLport-4.5.3/stlport/stl/_config.h Fri Jan 18 15:08:36 2002
|
||||
+++ STLport-4.5.3-devel/stlport/stl/_config.h Tue Jan 7 15:28:08 2003
|
||||
@@ -26,6 +26,16 @@
|
||||
#ifndef _STLP_CONFIG_H
|
||||
# define _STLP_CONFIG_H
|
||||
@ -264,9 +264,9 @@ diff -urN STLport-4.5.3.orig/stlport/stl/_config.h STLport-4.5.3/stlport/stl/_co
|
||||
# define _STLP_USE_GLIBC 1
|
||||
# endif
|
||||
# elif defined(macintosh) || defined (_MAC)
|
||||
diff -urN STLport-4.5.3.orig/stlport/stl/_stdio_file.h STLport-4.5.3/stlport/stl/_stdio_file.h
|
||||
--- STLport-4.5.3.orig/stlport/stl/_stdio_file.h Fri Jan 18 15:07:00 2002
|
||||
+++ STLport-4.5.3/stlport/stl/_stdio_file.h Mon Sep 9 02:35:46 2002
|
||||
diff -urN STLport-4.5.3/stlport/stl/_stdio_file.h STLport-4.5.3-devel/stlport/stl/_stdio_file.h
|
||||
--- STLport-4.5.3/stlport/stl/_stdio_file.h Fri Jan 18 15:07:00 2002
|
||||
+++ STLport-4.5.3-devel/stlport/stl/_stdio_file.h Tue Jan 7 15:28:08 2003
|
||||
@@ -634,6 +634,57 @@
|
||||
}
|
||||
# define _STLP_FILE_I_O_IDENTICAL
|
||||
@ -325,16 +325,26 @@ diff -urN STLport-4.5.3.orig/stlport/stl/_stdio_file.h STLport-4.5.3/stlport/stl
|
||||
#else /* A C library that we don't have an implementation for. */
|
||||
|
||||
# error The C++ I/O library is not configured for this compiler
|
||||
diff -urN STLport-4.5.3.orig/stlport/stl/c_locale.h STLport-4.5.3/stlport/stl/c_locale.h
|
||||
--- STLport-4.5.3.orig/stlport/stl/c_locale.h Fri Jan 18 15:07:00 2002
|
||||
+++ STLport-4.5.3/stlport/stl/c_locale.h Mon Sep 9 02:11:00 2002
|
||||
@@ -326,6 +326,19 @@
|
||||
diff -urN STLport-4.5.3/stlport/stl/c_locale.h STLport-4.5.3-devel/stlport/stl/c_locale.h
|
||||
--- STLport-4.5.3/stlport/stl/c_locale.h Fri Jan 18 15:07:00 2002
|
||||
+++ STLport-4.5.3-devel/stlport/stl/c_locale.h Wed Jan 8 10:58:10 2003
|
||||
@@ -326,6 +326,29 @@
|
||||
# define _Locale_PRINT _R
|
||||
# define _Locale_ALPHA _A
|
||||
|
||||
+# elif defined (_STLP_USE_UCLIBC)
|
||||
+
|
||||
+# include <linux/ctype.h>
|
||||
+//# include <linux/ctype.h>
|
||||
+
|
||||
+#define _U 0x01 /* upper */
|
||||
+#define _L 0x02 /* lower */
|
||||
+#define _D 0x04 /* digit */
|
||||
+#define _C 0x08 /* cntrl */
|
||||
+#define _P 0x10 /* punct */
|
||||
+#define _S 0x20 /* white space (space/lf/tab) */
|
||||
+#define _X 0x40 /* hex digit */
|
||||
+#define _SP 0x80 /* hard space (0x20) */
|
||||
+
|
||||
+# define _Locale_CNTRL _C
|
||||
+# define _Locale_UPPER _U
|
||||
+# define _Locale_LOWER _L
|
||||
@ -348,7 +358,7 @@ diff -urN STLport-4.5.3.orig/stlport/stl/c_locale.h STLport-4.5.3/stlport/stl/c_
|
||||
# elif defined (__hpux) || defined (__osf__)
|
||||
|
||||
# if defined(__HP_aCC) && !defined(_INCLUDE_HPUX_SOURCE)
|
||||
@@ -401,6 +414,8 @@
|
||||
@@ -401,6 +424,8 @@
|
||||
# define _Locale_SPACE _S
|
||||
# define _Locale_PRINT (_P | _U | _L | _N | _B)
|
||||
# define _Locale_ALPHA (_U | _L)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user