Attachment #35477 for bug #57267

View | Details | Raw Unified | Return to bug 57267
Collapse All | Expand All

Lines 72-78 Link Here

(-)Makefile (-1 / +1 lines)
72	post-build: test	72	post-build: test
73	.endif	73	.endif
74		74
75	test:	75	test: do-build
76	cd ${WRKSRC}/../test/eh && ${SETENV} CC=${CC} CXX=${CXX} \	76	cd ${WRKSRC}/../test/eh && ${SETENV} CC=${CC} CXX=${CXX} \
77	${GMAKE} -f ${MAKEFILE} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \	77	${GMAKE} -f ${MAKEFILE} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
78	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \	78	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \




--- stlport/config/stl_gcc.h.orig	Thu Jan 10 19:41:58 2002
+++ stlport/config/stl_gcc.h	Thu Jun  6 23:15:40 2002
@@ -9,8 +9,14 @@
 
 #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
 
-# if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__)
+# if defined (__hpux) || defined(__amigaos__)
 #  define _STLP_NO_WCHAR_T
+# elif defined(__FreeBSD__)
+# if (__FreeBSD_cc_version < 500005)
+# define _STLP_NO_WCHAR_T
+# else
+# define _STLP_FREEBSD_HAS_WFUNCS
+# endif /* __FreeBSD_cc_version < 500005 */
 # endif
 
 # if defined (__sun)
@@ -77,7 +83,7 @@
 
 # endif
 
-#if defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (__sun)) 
+#if defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (_STLP_FREEBSD_HAS_WFUNCS) || defined (__sun))
 #ifndef __MINGW32__
 #   define _STLP_NO_NATIVE_MBSTATE_T      1
 #endif
@@ -250,8 +256,17 @@
 
 # if (__GNUC__ >= 3)
 
+#ifdef __FreeBSD__
+#  if (__FreeBSD_cc_version > 500005)
+#    define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__
+#  else
+#    define _STLP_NATIVE_INCLUDE_PATH ../g++
+#    define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
+#  endif
+#else
 #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
 #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward




--- stlport/cwchar.orig	Thu Jan 10 19:41:56 2002
+++ stlport/cwchar	Thu Jun  6 23:24:28 2002
@@ -21,6 +21,10 @@
 #  include <stl/_prolog.h>
 # endif
 
+#if defined (__FreeBSD__) && defined (__GNUC__)
+# include <../wchar.h>
+#endif
+
 # ifdef __GNUC__
 #  include <cstddef>
 # endif
@@ -36,7 +40,7 @@
 # elif defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T)
 
 #  include _STLP_NATIVE_C_HEADER(stddef.h)
-#  if defined (__FreeBSD__) || defined (__Lynx__)
+#  if defined (__Lynx__)
 #   ifndef _WINT_T
 typedef long int wint_t;
 #    define _WINT_T




--- stlport/stl/_bvector.h.orig	Fri Oct  3 23:22:06 2003
+++ stlport/stl/_bvector.h	Fri Oct  3 23:22:38 2003
@@ -34,7 +34,9 @@
 # include <stl/_vector.h>
 # endif
 
+#ifndef __WORD_BIT
 #define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
+#endif
 
 _STLP_BEGIN_NAMESPACE 
 

Return to bug 57267

Lines 1-12 Link Here

(-)files/patch-stlport::config::stl_gcc.h (-3 / +32 lines)
1	--- stlport/config/stl_gcc.h.orig Thu Jan 10 19:41:58 2002	1	--- stlport/config/stl_gcc.h.orig Thu Jan 10 19:41:58 2002
2	+++ stlport/config/stl_gcc.h Thu Jun 6 23:15:40 2002	2	+++ stlport/config/stl_gcc.h Thu Jun 6 23:15:40 2002
3	@@ -250,8 +250,13 @@	3	@@ -9,8 +9,14 @@
		4
		5	# define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
		6
		7	-# if defined(__FreeBSD__) \|\| defined (__hpux) \|\| defined(__amigaos__)
		8	+# if defined (__hpux) \|\| defined(__amigaos__)
		9	# define _STLP_NO_WCHAR_T
		10	+# elif defined(__FreeBSD__)
		11	+# if (__FreeBSD_cc_version < 500005)
		12	+# define _STLP_NO_WCHAR_T
		13	+# else
		14	+# define _STLP_FREEBSD_HAS_WFUNCS
		15	+# endif /* __FreeBSD_cc_version < 500005 */
		16	# endif
		17
		18	# if defined (__sun)
		19	@@ -77,7 +83,7 @@
		20
		21	# endif
		22
		23	-#if defined (__CYGWIN__) \|\| defined (__MINGW32__) \|\| !(defined (_STLP_USE_GLIBC) \|\| defined (__sun))
		24	+#if defined (__CYGWIN__) \|\| defined (__MINGW32__) \|\| !(defined (_STLP_USE_GLIBC) \|\| defined (_STLP_FREEBSD_HAS_WFUNCS) \|\| defined (__sun))
		25	#ifndef __MINGW32__
		26	# define _STLP_NO_NATIVE_MBSTATE_T 1
		27	#endif
		28	@@ -250,8 +256,17 @@
4		29
5	# if (__GNUC__ >= 3)	30	# if (__GNUC__ >= 3)
6		31
7	+#ifdef __FreeBSD__	32	+#ifdef __FreeBSD__
8	+# define _STLP_NATIVE_INCLUDE_PATH ../g++	33	+# if (__FreeBSD_cc_version > 500005)
9	+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward	34	+# define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__
		35	+# else
		36	+# define _STLP_NATIVE_INCLUDE_PATH ../g++
		37	+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
		38	+# endif
10	+#else	39	+#else
11	# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3	40	# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
12	# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward	41	# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward

Removed Link Here

(-)files/patch-stlport::cwchar (-22 lines)
1	--- stlport/cwchar.orig Thu Jan 10 19:41:56 2002
2	+++ stlport/cwchar Thu Jun 6 23:24:28 2002
3	@@ -21,6 +21,10 @@
4	# include <stl/_prolog.h>
5	# endif
6
7	+#if defined (__FreeBSD__) && defined (__GNUC__)
8	+# include <../wchar.h>
9	+#endif
10	+
11	# ifdef __GNUC__
12	# include <cstddef>
13	# endif
14	@@ -36,7 +40,7 @@
15	# elif defined (__MRC__) \|\| defined (__SC__) \|\| defined (__BORLANDC__) \|\| defined(__FreeBSD__) \|\| (defined (__GNUC__) && defined (__APPLE__) \|\| defined( __Lynx__ )) \|\| defined (_STLP_NO_WCHAR_T)
16
17	# include _STLP_NATIVE_C_HEADER(stddef.h)
18	-# if defined (__FreeBSD__) \|\| defined (__Lynx__)
19	+# if defined (__Lynx__)
20	# ifndef _WINT_T
21	typedef long int wint_t;
22	# define _WINT_T

Added Link Here

(-)files/patch-stlport::stl::_bvector.h (+12 lines)
1	--- stlport/stl/_bvector.h.orig Fri Oct 3 23:22:06 2003
2	+++ stlport/stl/_bvector.h Fri Oct 3 23:22:38 2003
3	@@ -34,7 +34,9 @@
4	# include <stl/_vector.h>
5	# endif
6
7	+#ifndef __WORD_BIT
8	#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
9	+#endif
10
11	_STLP_BEGIN_NAMESPACE
12