kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

For now, do not add libstd++ lib to the package. A libgcc_s.so is missing

Browse source 
on CURRENT. I'll investigate here what's wrong.
This commit is contained in:
Martin Blapp 2002-06-02 21:43:03 +00:00
parent 257e43929f
commit fc8edb0c15
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=60493
46 changed files with 2438 additions and 621 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-1.0/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice-1.0/files/patch-product::inc::scp::udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-1.0/files/patch-product::util::makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice-1.1/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-1.1/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-2.0-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice-3-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-3-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice-3/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-3/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-1.0/files/patch-product::inc::scp::udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-1.0/files/patch-product::util::makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-1.1-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-1.1/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-1.1/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-2-RC/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-2-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-2-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-2.0/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-2.0/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-2/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-2/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-3-devel/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-3-devel/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-3/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice/files/patch-product+util+makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

48
editors/openoffice/files/patch-product::inc::scp::udk_basefiles.scp Normal file
View file

@ -0,0 +1,48 @@
--- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002
+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002
@@ -2,7 +2,9 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
// (setup is linked against it).
-#if ( defined( _gcc3 ) && defined( C300 ) )
+#if ( defined ( LINUX ))
+#if ( defined( _gcc3 ) && defined( C300 ))
+
File gid_File_Lib_gcc
BIN_FILE_BODY;
Name = STRING(libgcc_s.so.1);
@@ -10,6 +12,24 @@
Styles = (PACKED, SETUPZIP);
End
+#if ( CCNUMVER >= 000300010000 )
+
+File gid_File_Lib_Stdc
+ BIN_FILE_BODY;
+ Name = STRING(libstdc++.so.4.0.0);
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+End
+
+Shortcut gid_Shortcut_Lib_Stdc
+ FileID = gid_File_Lib_Stdc;
+ Dir = GCFG_BINARY_DIR;
+ Name = STRING(libstdc++.so.4);
+ Styles = (NETWORK,RELATIVE);
+End
+
+#else
+
File gid_File_Lib_Stdc
BIN_FILE_BODY;
Name = STRING(libstdc++.so.3.0.1);
@@ -23,6 +43,9 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
End
+
+#endif
+#endif
#endif
File gid_File_Lib_Sal

85
editors/openoffice/files/patch-product::util::makefile.mk
View file

@ -1,36 +1,67 @@
--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002
+++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002
@@ -157,6 +157,15 @@
STLPORTLIBNAME=stlport_vc6.dll
--- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
.IF "$(COMID)"=="gcc3"
+.IF "$(CCNUMVER)">="000300010000"
+ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.4 \
+ $(DESTDIRDLL)$/libstdc++.so.4.0.0
+.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/w9xucwrp.dll
+.ELIF "$(OS)"=="FREEBSD"
+###########
+# FREEBSD
+###########
+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
+DESTDIRDLL=$(DESTDIRLIB)
+STLPORTLIBNAME=libstlport_gcc.so
+BINDINGDLL=gcc2_uno
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
$(DESTDIRDLL)$/libstdc++.so.3 \
$(DESTDIRDLL)$/libstdc++.so.3.0.1
.ENDIF
+.ENDIF
.ELIF "$(OS)"=="FREEBSD"
###########
# FREEBSD
@@ -123,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
@@ -447,6 +448,20 @@
STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
@@ -428,7 +437,7 @@
$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
#---------------------------------------------------------
# special targets for linux gcc3
+
+.IF "$(OS)"=="LINUX"
+.IF "$(CCNUMVER)">="000300010000"
+
+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+
+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+ -rm -f $@
+ +ln -fs libstdc++.so.4.0.0 $@
+
+.ELSE
+
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.3.0.1 $@
+ +ln -fs libstdc++.so.3.0.1 $@
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
@@ -436,7 +445,7 @@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
@@ -462,6 +477,8 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -s libgcc_s.so.1 $@
+ +ln -fs libgcc_s.so.1 $@
+ln -fs libgcc_s.so.1 $@
+.ENDIF
+.ENDIF
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)