1d931158b0
install set, and bump port revision accordingly. PR: 119314 Submitted by: Pavevl <legioner.r@gmail.com>
69 lines
2 KiB
Text
69 lines
2 KiB
Text
Index: scp2/source/ooo/file_library_ooo.scp
|
|
===================================================================
|
|
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
|
|
retrieving revision 1.269
|
|
diff -u -r1.269 file_library_ooo.scp
|
|
--- scp2/source/ooo/file_library_ooo.scp 12 Dec 2007 13:29:11 -0000 1.269
|
|
+++ scp2/source/ooo/file_library_ooo.scp 6 Jan 2008 04:19:50 -0000
|
|
@@ -979,7 +979,7 @@
|
|
|
|
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
|
|
|
|
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
|
|
+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
|
|
#if defined( _gcc3 )
|
|
|
|
File gid_File_Lib_Gcc
|
|
@@ -993,7 +993,7 @@
|
|
|
|
#endif
|
|
|
|
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
|
|
+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
|
|
#if defined( _gcc3 )
|
|
|
|
File gid_File_Lib_Stdc
|
|
|
|
|
|
-----------------
|
|
Strange behaviour of stock gcc of FreeBSD 7.
|
|
|
|
# gcc -print-file-name=libgcc_s.so
|
|
/usr/lib/libgcc_s.so
|
|
# gcc -print-file-name=libgcc_s.so.1
|
|
libgcc_s.so.1
|
|
. This sould be
|
|
# gcc -print-file-name=libgcc_s.so.1
|
|
/lib/libgcc_s.so.1
|
|
|
|
However gcc42 from ports behaves correctly;
|
|
and
|
|
# gcc42 -print-file-name=libgcc_s.so.1
|
|
/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so.1
|
|
# gcc42 -print-file-name=libgcc_s.so
|
|
/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so
|
|
.
|
|
|
|
Index: work/OOH680_m1/external/gcc3_specific/makefile.mk
|
|
===================================================================
|
|
RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v
|
|
retrieving revision 1.5
|
|
diff -u -r1.5 makefile.mk
|
|
--- external/gcc3_specific/makefile.mk 30 Aug 2006 12:39:00 -0000 1.5
|
|
+++ external/gcc3_specific/makefile.mk 6 Jan 2008 08:10:19 -0000
|
|
@@ -12,7 +12,6 @@
|
|
|
|
.IF "$(OS)"!="MACOSX"
|
|
.IF "$(OS)"!="IRIX"
|
|
-.IF "$(OS)"!="FREEBSD"
|
|
|
|
.EXPORT : CC
|
|
|
|
@@ -25,7 +24,6 @@
|
|
$(LB)$/libgcc_s.so.1 :
|
|
$(GCCINSTLIB) libgcc_s.so.1 $(LB)
|
|
|
|
-.ENDIF
|
|
.ENDIF
|
|
.ENDIF
|
|
|