Attachment #7291 for bug #12677

Lines 113-124 Link Here

(-)oo_1.0.1_src/product/util/makefile.mk (-8 / +8 lines)
113	BINDINGDLL=$(COMNAME)_uno	113	BINDINGDLL=$(COMNAME)_uno
114		114
115	.IF "$(COMID)"=="gcc3"	115	.IF "$(COMID)"=="gcc3"
116	.IF "$(CCNUMVER)">="000300010000"	116	.IF "$(CCNUMVER)">="000300020000"
117	ADDITIONAL_DLLS= \	117	ADDITIONAL_DLLS= \
118	$(DESTDIRDLL)$/libgcc_s.so.1 \	118	$(DESTDIRDLL)$/libgcc_s.so.1 \
119	$(DESTDIRDLL)$/libgcc_s.so \	119	$(DESTDIRDLL)$/libgcc_s.so \
120	$(DESTDIRDLL)$/libstdc++.so.4 \	120	$(DESTDIRDLL)$/libstdc++.so.5 \
121	$(DESTDIRDLL)$/libstdc++.so.4.0.0	121	$(DESTDIRDLL)$/libstdc++.so.5.0.2
122	.ELSE	122	.ELSE
123	ADDITIONAL_DLLS= \	123	ADDITIONAL_DLLS= \
124	$(DESTDIRDLL)$/libgcc_s.so.1 \	124	$(DESTDIRDLL)$/libgcc_s.so.1 \
Lines 498-512 Link Here
498	#---------------------------------------------------------	498	#---------------------------------------------------------
499	# special targets for linux gcc3	499	# special targets for linux gcc3
500		500
501	.IF "$(CCNUMVER)">="000300010000"	501	.IF "$(CCNUMVER)">="000300020000"
502		502
503	$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)	503	$(DESTDIRDLL)$/libstdc++.so.5.0.2 : $(DLLOUT)$/libstdc++.so.5.0.2 $(DIRLIST)
504	-rm -f $@	504	-rm -f $@
505	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@	505	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.5.0.2 $@
506		506
507	$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)	507	$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.5.0.2 $(DIRLIST)
508	-rm -f $@	508	-rm -f $@
509	+ln -s libstdc++.so.4.0.0 $@	509	+ln -s libstdc++.so.5.0.2 $@
510		510
511	.ELSE	511	.ELSE
512		512




    Styles		= (PACKED, SETUPZIP);
End

#if ( CCNUMVER >= 000300020000 )

File gid_File_Lib_Stdc
    BIN_FILE_BODY;
    Name               = STRING(libstdc++.so.5.0.2);
    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.5);
    Styles      = (NETWORK,RELATIVE);
End


Return to bug 12677

Lines 11-21 Link Here

(-)oo_1.0.1_src/product/inc/scp/udk_basefiles.scp (-3 / +3 lines)
11	Styles = (PACKED, SETUPZIP);	11	Styles = (PACKED, SETUPZIP);
12	End	12	End
13		13
14	#if ( CCNUMVER >= 000300010000 )	14	#if ( CCNUMVER >= 000300020000 )
15		15
16	File gid_File_Lib_Stdc	16	File gid_File_Lib_Stdc
17	BIN_FILE_BODY;	17	BIN_FILE_BODY;
18	Name = STRING(libstdc++.so.4.0.0);	18	Name = STRING(libstdc++.so.5.0.2);
19	Dir = GCFG_BINARY_DIR;	19	Dir = GCFG_BINARY_DIR;
20	Styles = (PACKED, SETUPZIP);	20	Styles = (PACKED, SETUPZIP);
21	End	21	End
Lines 24-30 Link Here
24	Shortcut gid_Shortcut_Lib_Stdc	24	Shortcut gid_Shortcut_Lib_Stdc
25	FileID = gid_File_Lib_Stdc;	25	FileID = gid_File_Lib_Stdc;
26	Dir = GCFG_BINARY_DIR;	26	Dir = GCFG_BINARY_DIR;
27	Name = STRING(libstdc++.so.4);	27	Name = STRING(libstdc++.so.5);
28	Styles = (NETWORK,RELATIVE);	28	Styles = (NETWORK,RELATIVE);
29	End	29	End
30		30