summaryrefslogtreecommitdiff
path: root/editors/openoffice-3/files/patch-i85027
blob: e6fe720647bc500e2d33e4f7625c3607ab3468fb (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
-----------------
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 
 
--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
+++ scp2/source/ooo/ure.scp	21 Mar 2008 09:26:48 -0000
@@ -728,7 +730,7 @@
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined NETBSD \
 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
@@ -739,7 +741,7 @@
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined NETBSD \
 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
 File gid_File_Dl_Stdcpp
     Dir = SCP2_URE_DL_DIR;