? unxlngppc.pro
Index: STLport-4.5.3.patch
===================================================================
RCS file: /cvs/external/stlport/STLport-4.5.3.patch,v
retrieving revision 1.4
diff -u -r1.4 STLport-4.5.3.patch
--- STLport-4.5.3.patch	27 Mar 2003 11:54:46 -0000	1.4
+++ STLport-4.5.3.patch	16 Jun 2003 14:31:24 -0000
@@ -42,7 +42,7 @@
 ! #
 ! #
 ! LINK=ar cr
-! DYN_LINK=g++ --fexceptions -shared -o
+! DYN_LINK=g++ ${PTHREAD_LIBS} -fexceptions -shared -o
 ! 
 ! OBJEXT=o
 ! DYNEXT=so
@@ -145,46 +145,26 @@
     }
   
     size_type count(const key_type& __key) const { return _M_ht.count(__key); }
-*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	2002-01-10 19:41:58.000000000 +0100
---- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	2002-10-07 16:49:34.000000000 +0200
-***************
-*** 248,254 ****
-  #     define _STLP_HAS_NO_EXCEPTIONS  1
-  #   endif
-  
-! # if (__GNUC__ >= 3)
-  
-  #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-  #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
---- 248,278 ----
-  #     define _STLP_HAS_NO_EXCEPTIONS  1
-  #   endif
-  
-! # define _STLP_CONCAT(X,Y) X Y
-! #  define _STLP_GCC_VERSUFFIX __GNUC__.__GNUC_MINOR__
-! # if (defined __GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0)
-! #  define _STLP_GCC_VERSION \
-! 	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-! # else
-! #  define _STLP_GCC_VERSION \
-! 	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 )
-! # endif
-! 
-! # if _STLP_GCC_VERSION >= 30101
-! // gcc >= 3.1.1 - /usr/include/c++/<gcc_version>/
-! 
-! #  define _STLP_NATIVE_INCLUDE_PATH _STLP_CONCAT(../../include/c++/,_STLP_GCC_VERSUFFIX)
+*** misc/STLport-4.5.3/stlport/config/stl_gcc.h   Tue Sep  4 13:10:16 2001
+--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h     Mon Nov 11 09:37:18 2002
+*************** typedef unsigned int wint_t;
+*** 226,233 ****
+ 
+  # if (__GNUC__ >= 3)
+ 
+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+ 
+  # elif (__GNUC_MINOR__ < 8)
+
+--- 226,235 ----
+ 
+  # if (__GNUC__ >= 3)
+
+! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #  define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
 ! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
-!         _STLP_CONCAT(../../include/c++/,_STLP_CONCAT(_STLP_GCC_VERSUFFIX,/backward))
-! 
-! # elif (__GNUC__ == 3) && (__GNUC_MINOR__ == 1)
-! // gcc 3.1 - /usr/include/g++-v31/
-! 
-! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v31
-! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v31/backward
-! 
-! # elif (__GNUC__ == 3) && (__GNUC_MINOR__ == 0)
-! // gcc 3.0 - /usr/include/g++-v3/
-  
-  #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-  #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+!           GXX_INCLUDE_PATH/backward
+
+  # elif (__GNUC_MINOR__ < 8)
+
Index: STLport-4.5.patch
===================================================================
RCS file: /cvs/external/stlport/STLport-4.5.patch,v
retrieving revision 1.10
diff -u -r1.10 STLport-4.5.patch
--- STLport-4.5.patch	27 Mar 2003 11:54:46 -0000	1.10
+++ STLport-4.5.patch	16 Jun 2003 14:31:24 -0000
@@ -11,8 +11,8 @@
 ! #
 ! # compiler
 ! # take these from the OOo build environment
-! CC*= gcc 
-! CXX*= g++
+! #CC*= gcc 
+! #CXX*= g++
 ! 
 ! #
 ! # Basename for libraries
@@ -24,7 +24,7 @@
 ! #
 ! #
 ! LINK=ar cr
-! DYN_LINK=$(CXX) --fexceptions -shared -o
+! DYN_LINK=$(CXX) ${PTHREAD_LIBS} -fexceptions -shared -o
 ! 
 ! OBJEXT=o
 ! DYNEXT=so
@@ -160,7 +160,7 @@
 +#
 +#
 +LINK=ar cr
-+DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=so
Index: makefile.mk
===================================================================
RCS file: /cvs/external/stlport/makefile.mk,v
retrieving revision 1.20.6.3
diff -u -r1.20.6.3 makefile.mk
--- makefile.mk	27 May 2003 14:19:53 -0000	1.20.6.3
+++ makefile.mk	16 Jun 2003 14:31:24 -0000
@@ -72,8 +72,8 @@
 # --- Files --------------------------------------------------------
 .EXPORT : CC CXX
 .IF "$(COMID)"=="gcc3"
-TARFILE_NAME=STLport-4.5
-PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
+TARFILE_NAME=STLport-4.5.3
+PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
 .ELSE			# "$(COMID)"=="gcc3"
 .IF "$(OS)"=="MACOSX"
 # [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
@@ -182,7 +182,7 @@
        @echo "         Therefore the version provided here does not need to be built in addition."
        +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
 .ELSE
-all : $(MISC)$/STLport-4.5.patch ALLTAR
+all : $(MISC)$/$(TARFILE_NAME).patch ALLTAR
 .ENDIF
 
 .INCLUDE : set_ext.mk
@@ -190,8 +190,8 @@
 .INCLUDE :	tg_ext.mk
 
 
-$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
-	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
+$(MISC)$/$(TARFILE_NAME).patch : $(TARFILE_NAME).patch
+	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < $(TARFILE_NAME).patch > $(MISC)$/$(TARFILE_NAME).patch
 
 .IF "$(GUI)"=="WNT"
 .IF "$(CCNUMVER)"<="001300000000"