[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/apply                                |    4 -
 patches/dev300/buildfix-gcc-4.1.2-linker-error.diff |   55 --------------------
 2 files changed, 59 deletions(-)

New commits:
commit d0ddd76ac82938eab9c9c965a3fb5d2bcffbe6eb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jun 26 14:34:37 2009 +0200

    Bin obsolete hack for older binutils
    
    * patches/dev300/buildfix-gcc-4.1.2-linker-error.diff:
    * patches/dev300/apply: bin, obsoleted by the last changes in
      link-as-needed.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index df4b9ee..9e4abc3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -241,10 +241,6 @@ linkoo-dev300.diff, jholesov
 # until the internal compiler error is fixed
 # buildfix-gcc-4.3-compiler-error.diff, n#370383, pmladek
 
-# temporary hack to avoid a linker crash with ooo310-m1 on SLED10
-# it adds -Wl,--no-as-needed when the gcc-4.1.2 is used
-buildfix-gcc-4.1.2-linker-error.diff
-
 # Make the historically very verbose build quieter, helps us see warnings.
 quiet-build.diff, i#84497, michael
 quiet-build-more.diff, i#84497, thorsten
diff --git a/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff b/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff
deleted file mode 100644
index c1bfcb6..0000000
--- a/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- cppcanvas/util/makefile.mk.old	2009-02-12 14:58:01.000000000 +0100
-+++ cppcanvas/util/makefile.mk	2009-02-18 12:54:35.000000000 +0100
-@@ -48,6 +48,11 @@ LIB1FILES=\
- 	$(SLB)$/metafilerenderer.lib	\
- 	$(SLB)$/cppcanvastools.lib
- 
-+.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)"=="000400010002"
-+# linker started to crash on SLED10 with ooo310-m1 sources
-+LINKFLAGS+=-Wl,--no-as-needed
-+.ENDIF
-+
- SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
- SHL1IMPLIB= 	i$(TARGET)
- SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
---- formula/util/makefile.mk.old	2009-02-12 14:54:21.000000000 +0100
-+++ formula/util/makefile.mk	2009-02-23 13:37:56.000000000 +0100
-@@ -41,6 +41,10 @@ GEN_HID_OTHER=TRUE
- # --- Settings ----------------------------------
- .INCLUDE :  settings.mk
- 
-+.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)"=="000400010002" 
-+# linker started to crash on SLED10 with ooo310-m1 sources 
-+LINKFLAGS+=-Wl,--no-as-needed 
-+.ENDIF 
- 
- # --- formula core (for) -----------------------------------
- 
---- sd/util/makefile.mk.old	2009-04-30 17:09:23.000000000 +0200
-+++ sd/util/makefile.mk	2009-04-30 18:55:56.000000000 +0200
-@@ -41,6 +41,11 @@ USE_DEFFILE=TRUE
- 
- .INCLUDE :  settings.mk
- 
-+.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)"=="000400010002" 
-+# linker started to crash on SLED10 with ooo310-m1 sources 
-+LINKFLAGS+=-Wl,--no-as-needed 
-+.ENDIF 
-+
- # --- Resources ----------------------------------------------------
- 
- RESLIB1NAME=sd
---- sw/util/makefile.mk.old	2009-02-17 13:34:44.000000000 +0100
-+++ sw/util/makefile.mk	2009-02-18 14:43:26.000000000 +0100
-@@ -47,6 +47,11 @@ USE_DEFFILE=TRUE
- LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=40
- .ENDIF
- 
-+.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)"=="000400010002"
-+# linker started to crash on SLED10 with ooo310-m1 sources
-+LINKFLAGS+=-Wl,--no-as-needed
-+.ENDIF
-+
- sw_res_files= \
-     $(SRS)$/app.srs          \
-     $(SRS)$/dialog.srs       \