adapt unxlng*.mk-touching patches after cmcfixes62

1 files changed, 6 insertions, 149 deletions

diff --git a/patches/dev300/link-as-needed.diff b/patches/dev300/link-as-needed.diff
index 160c4d0e2..626dbb3c0 100644
--- a/patches/dev300/link-as-needed.diff
+++ b/patches/dev300/link-as-needed.diff
@@ -103,36 +103,11 @@ diff -purN solenv.old/inc/unxirxm3.mk solenv/inc/unxirxm3.mk
  LINKVERSIONMAPFLAG= -Wl,-exports_file
  
  LINKFLAGSAPPGUI= $(THREADLIB)
-diff -purN solenv.old/inc/unxlnga.mk solenv/inc/unxlnga.mk
---- solenv.old/inc/unxlnga.mk	2008-07-11 16:44:03.000000000 +0200
-+++ solenv/inc/unxlnga.mk	2009-06-24 21:39:06.000000000 +0200
-@@ -164,6 +164,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
---- solenv.old/inc/unxlngi4.mk	2008-07-11 16:44:16.000000000 +0200
-+++ solenv/inc/unxlngi4.mk	2009-06-24 21:25:52.000000000 +0200
-@@ -141,6 +141,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngi6.mk solenv/inc/unxlngi6.mk
---- solenv.old/inc/unxlngi6.mk	2009-06-24 18:41:22.000000000 +0200
-+++ solenv/inc/unxlngi6.mk	2009-06-24 21:25:06.000000000 +0200
-@@ -161,6 +161,9 @@ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,comb
+Index: unxlng.mk
+===================================================================
+--- solenv/inc/unxlng.mk	(Revision 276754)
++++ solenv/inc/unxlng.mk	(Arbeitskopie)
+@@ -161,6 +161,9 @@
  .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
  LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
  .ENDIF
@@ -141,125 +116,7 @@ diff -purN solenv.old/inc/unxlngi6.mk solenv/inc/unxlngi6.mk
 +.ENDIF
  
  # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngm68k.mk solenv/inc/unxlngm68k.mk
---- solenv.old/inc/unxlngm68k.mk	2008-06-30 17:03:13.000000000 +0200
-+++ solenv/inc/unxlngm68k.mk	2009-06-24 21:38:53.000000000 +0200
-@@ -144,6 +144,9 @@ LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORI
- LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngmips.mk solenv/inc/unxlngmips.mk
---- solenv.old/inc/unxlngmips.mk	2008-06-09 14:38:46.000000000 +0200
-+++ solenv/inc/unxlngmips.mk	2009-06-24 21:34:56.000000000 +0200
-@@ -175,6 +175,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngp.mk solenv/inc/unxlngp.mk
---- solenv.old/inc/unxlngp.mk	2008-04-10 19:50:07.000000000 +0200
-+++ solenv/inc/unxlngp.mk	2009-06-24 21:36:43.000000000 +0200
-@@ -97,6 +97,10 @@ LINKFLAGSPROF=
- LINKFLAGSDEBUG=-g
- LINKFLAGSOPT=
- 
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
-+
- .IF "$(NO_BSYMBOLIC)"==""
- .IF "$(PRJNAME)" != "envtest"
- LINKFLAGSSHLGUI+=-Bsymbolic
-diff -purN solenv.old/inc/unxlngppc4.mk solenv/inc/unxlngppc4.mk
---- solenv.old/inc/unxlngppc4.mk	2009-06-24 18:41:22.000000000 +0200
-+++ solenv/inc/unxlngppc4.mk	2009-06-24 21:38:59.000000000 +0200
-@@ -138,6 +138,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- LINKFLAGS= $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngppc.mk solenv/inc/unxlngppc.mk
---- solenv.old/inc/unxlngppc.mk	2009-06-24 18:41:22.000000000 +0200
-+++ solenv/inc/unxlngppc.mk	2009-06-24 21:35:25.000000000 +0200
-@@ -135,6 +135,9 @@ LINK*=$(CXX)
- LINKC*=$(CC)
- # default linker flags
- LINKFLAGS=-Wl,-rpath,\''$$ORIGIN'\'
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- 
- # linker flags for linking applications
-diff -purN solenv.old/inc/unxlngr.mk solenv/inc/unxlngr.mk
---- solenv.old/inc/unxlngr.mk	2008-11-10 17:06:12.000000000 +0100
-+++ solenv/inc/unxlngr.mk	2009-06-24 21:35:02.000000000 +0200
-@@ -145,6 +145,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngs3904.mk solenv/inc/unxlngs3904.mk
---- solenv.old/inc/unxlngs3904.mk	2008-06-09 14:39:39.000000000 +0200
-+++ solenv/inc/unxlngs3904.mk	2009-06-24 21:28:06.000000000 +0200
-@@ -143,6 +143,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngs.mk solenv/inc/unxlngs.mk
---- solenv.old/inc/unxlngs.mk	2009-06-24 18:41:22.000000000 +0200
-+++ solenv/inc/unxlngs.mk	2009-06-24 21:28:45.000000000 +0200
-@@ -144,6 +144,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-z combreloc $(LINKFLAGSDEFS)
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-diff -purN solenv.old/inc/unxlngx6.mk solenv/inc/unxlngx6.mk
---- solenv.old/inc/unxlngx6.mk	2009-06-24 18:41:22.000000000 +0200
-+++ solenv/inc/unxlngx6.mk	2009-06-24 21:26:08.000000000 +0200
-@@ -165,6 +165,9 @@ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDE
- .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
- LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
- .ENDIF
-+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
-+LINKFLAGS += -Wl,--as-needed
-+.ENDIF
- 
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
 diff -purN solenv.old/inc/unxmacx.mk solenv/inc/unxmacx.mk
 --- solenv.old/inc/unxmacx.mk	2009-06-24 18:41:22.000000000 +0200
 +++ solenv/inc/unxmacx.mk	2009-06-24 21:38:13.000000000 +0200