View | Details | Raw Unified | Return to issue 13620
Collapse All | Expand All

(-)STLport-4.5.3.patch (-2 / +1 lines)
Lines 42-48 Link Here
42 
! #
 42 
! #
43 
! #
 43 
! #
44 
! LINK=ar cr
 44 
! LINK=ar cr
45 
! DYN_LINK=g++ --fexceptions -shared -o
 45 
! DYN_LINK=g++ ${PTHREAD_LIBS} -fexceptions -shared -o
46 
!
46 
!
47 
! OBJEXT=o
 47 
! OBJEXT=o
48 
! DYNEXT=so
 48 
! DYNEXT=so
Lines 145-190 Link Here
145 
    }
 145 
    }
146
146
147 
    size_type count(const key_type& __key) const { return _M_ht.count(__key); }
 147 
    size_type count(const key_type& __key) const { return _M_ht.count(__key); }
148 
*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	2002-01-10 19:41:58.000000000 +0100
(-)STLport-4.5.patch (-4 / +4 lines)
Lines 11-18 Link Here
11 
! #
 11 
! #
12 
! # compiler
 12 
! # compiler
13 
! # take these from the OOo build environment
 13 
! # take these from the OOo build environment
14 
! CC*= gcc
14 
! #CC*= gcc
15 
! CXX*= g++
 15 
! #CXX*= g++
16 
!
16 
!
17 
! #
 17 
! #
18 
! # Basename for libraries
 18 
! # Basename for libraries
Lines 24-30 Link Here
24 
! #
 24 
! #
25 
! #
 25 
! #
26 
! LINK=ar cr
 26 
! LINK=ar cr
27 
! DYN_LINK=$(CXX) --fexceptions -shared -o
 27 
! DYN_LINK=$(CXX) ${PTHREAD_LIBS} -fexceptions -shared -o
28 
!
28 
!
29 
! OBJEXT=o
 29 
! OBJEXT=o
30 
! DYNEXT=so
 30 
! DYNEXT=so
Lines 160-166 Link Here
160 
+#
 160 
+#
161 
+#
 161 
+#
162 
+LINK=ar cr
 162 
+LINK=ar cr
163 
+DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
 163 
+DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
164 
+
 164 
+
165 
+OBJEXT=o
 165 
+OBJEXT=o
166 
+DYNEXT=so
 166 
+DYNEXT=so
(-)makefile.mk (-5 / +5 lines)
Lines 72-79 Link Here
72 
# --- Files --------------------------------------------------------
 72 
# --- Files --------------------------------------------------------
73 
.EXPORT : CC CXX
 73 
.EXPORT : CC CXX
74 
.IF "$(COMID)"=="gcc3"
 74 
.IF "$(COMID)"=="gcc3"
75 
TARFILE_NAME=STLport-4.5
 75 
TARFILE_NAME=STLport-4.5.3
76 
PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
 76 
PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
77 
.ELSE			# "$(COMID)"=="gcc3"
 77 
.ELSE			# "$(COMID)"=="gcc3"
78 
.IF "$(OS)"=="MACOSX"
 78 
.IF "$(OS)"=="MACOSX"
79 
# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
 79 
# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
Lines 182-188 Link Here
182 
       @echo "         Therefore the version provided here does not need to be built in addition."
 182 
       @echo "         Therefore the version provided here does not need to be built in addition."
183 
       +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
 183 
       +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
184 
.ELSE
 184 
.ELSE
185 
all : $(MISC)$/STLport-4.5.patch ALLTAR
 185 
all : $(MISC)$/$(TARFILE_NAME).patch ALLTAR
186 
.ENDIF
 186 
.ENDIF
187 

          187
          

        

        

          188
          
.INCLUDE : set_ext.mk

          188
          
.INCLUDE : set_ext.mk

        

  

    
      
            Lines 190-197
          
      
      
        Link Here
      
    
  

        

          190
          
.INCLUDE :	tg_ext.mk

          190
          
.INCLUDE :	tg_ext.mk

        

        

          191
          

          191
          

        

        

          192
          

          192
          

        

          
            

              193
              
$(MISC)$/STLport-4.5.patch : STLport-4.5.patch


              193
              
$(MISC)$/$(TARFILE_NAME).patch : $(TARFILE_NAME).patch

            

            

              194
              
	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch


              194
              
	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < $(TARFILE_NAME).patch > $(MISC)$/$(TARFILE_NAME).patch

            

        

          195
          

          195
          

        

        

          196
          
.IF "$(GUI)"=="WNT"

          196
          
.IF "$(GUI)"=="WNT"

        

        

          197
          
.IF "$(CCNUMVER)"<="001300000000"

          197
          
.IF "$(CCNUMVER)"<="001300000000"

        






  

  Return to issue 13620