From aff9db4f58e6cd1015866e169a1a909fd6f31590 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Sat, 22 May 2010 15:59:46 +0100
Subject: cmcfixes75: #i111770# remove configure.in hacks and handle prelinked
 system-stdlibs properly and fix the so.1 -> so.2 for hppa and m68k

---
 solenv/bin/gccinstlib.pl | 9 +++++++++
 solenv/inc/settings.mk   | 2 +-
 solenv/inc/target.mk     | 1 +
 solenv/inc/tg_compv.mk   | 6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 7f52218c5..8ce9753a4 100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -53,4 +53,13 @@ foreach $Src (@CopySrc) {
     system ("/bin/cp $Src $Dest") && die "copy failed: $!";
 }
 
+
+foreach $File (@ARGV) {
+    #https://bugzilla.redhat.com/show_bug.cgi?id=149465
+    printf "unprelinking $Dest/$File\n";
+    #If it's already unprelinked .i.e. no .gnu.prelink_undo section, that's fine
+    #If prelink is not installed, it's massively unlikely that it's prelinked
+    system ("prelink -u $Dest/$File > /dev/null 2>&1");
+}
+
 exit (0);
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index d2fcafa3f..dd5592c40 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -865,7 +865,7 @@ SCPDEFS+=-DUDK_MAJOR=$(UDK_MAJOR)
 SCPDEFS+=-U$(COMID) -DCOMID=$(COMID) -DCOMNAME=$(COMNAME) -D_$(COMID)
 SCPDEFS+=-DCCNUMVER=$(CCNUMVER)
 .IF "$(COM)"=="GCC"
-SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3)
+SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3)
 .ENDIF			# "$(SHORTSTDCPP3)"!=""
 # extend library path for OS/2 gcc/wlink
 .IF "$(GUI)"=="OS2"
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 0319e92f3..05ef9c639 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1461,6 +1461,7 @@ COMPVTMP:=$(mktmp iii)
     @echo COMID:=$(COMID) >> $(COMPVTMP)
 .IF "$(COM)"=="GCC"
     @echo SHORTSTDCPP3:=$(SHORTSTDCPP3) >> $(COMPVTMP)
+    @echo SHORTSTDC3:=$(SHORTSTDC3) >> $(COMPVTMP)
 .ENDIF
     @echo CCNUMVER:=$(CCNUMVER) >> $(COMPVTMP)
     @echo CCVER:=$(CCVER:s/-/ /:1) >> $(COMPVTMP)
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 821888752..619d392b2 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -77,6 +77,7 @@ COMNAME=msci
 .IF "$(COM)"=="GCC"
 
 SHORTSTDCPP3:=
+SHORTSTDC3:="1"
 
 .IF "$(CCNUMVER)">="000200910000"
 COMID=GCC
@@ -101,6 +102,11 @@ SHORTSTDCPP3="5"
 .ENDIF
 
 .IF "$(CCNUMVER)">="000300040000"
+.IF "$(OS)$(CPU)" == "LINUXH" || "$(OS)$(CPU)" == "LINUX6"
+#gcc >= 3.4.0: on m68k-linux and hppa-linux this is libgcc_s.so.2. For all
+#others, this is libgcc_s.so.1.
+SHORTSTDC3:="2"
+.ENDIF
 SHORTSTDCPP3="6"
 .ENDIF
 
-- 
cgit v1.2.3


From 60551d88361f6adf8d7d2b9a22e6c8b4d6943058 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Tue, 25 May 2010 11:05:48 +0100
Subject: cmcfixes75: #i111770# fix the so.2 -> so.4 for hppa

---
 solenv/inc/tg_compv.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 619d392b2..68dc60b5c 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -102,10 +102,12 @@ SHORTSTDCPP3="5"
 .ENDIF
 
 .IF "$(CCNUMVER)">="000300040000"
-.IF "$(OS)$(CPU)" == "LINUXH" || "$(OS)$(CPU)" == "LINUX6"
-#gcc >= 3.4.0: on m68k-linux and hppa-linux this is libgcc_s.so.2. For all
-#others, this is libgcc_s.so.1.
+.IF "$(OS)$(CPU)" == "LINUX6"
+#for gcc >= 3.4.0 on m68k-linux this is libgcc_s.so.2.
 SHORTSTDC3:="2"
+.ELIF "$(OS)$(CPU)" == "LINUXH"
+#for gcc >= 3.4.0 on hppa-linux this is libgcc_s.so.4.
+SHORTSTDC3:="4"
 .ENDIF
 SHORTSTDCPP3="6"
 .ENDIF
-- 
cgit v1.2.3


From 0cd008f3d242ca2cbe361630dae52cab8642f421 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Tue, 8 Jun 2010 10:55:22 +0100
Subject: cmcfixes75: #i111770# fix the so.2 -> so.4 for hppa

---
 solenv/inc/tg_compv.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 68dc60b5c..c68ae5af4 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -102,11 +102,17 @@ SHORTSTDCPP3="5"
 .ENDIF
 
 .IF "$(CCNUMVER)">="000300040000"
-.IF "$(OS)$(CPU)" == "LINUX6"
+.IF "$(OS)$(CPU)" == "LINUX6" || "$(OS)$(CPU)" == "LINUXH"
 #for gcc >= 3.4.0 on m68k-linux this is libgcc_s.so.2.
+#for gcc >= 3.4.0 < 4.2.0 on hppa-linux this is libgcc_s.so.2.
 SHORTSTDC3:="2"
-.ELIF "$(OS)$(CPU)" == "LINUXH"
-#for gcc >= 3.4.0 on hppa-linux this is libgcc_s.so.4.
+.ENDIF
+SHORTSTDCPP3="6"
+.ENDIF
+
+.IF "$(CCNUMVER)">="000400020000"
+.IF "$(OS)$(CPU)" == "LINUXH"
+#for gcc >= 4.2.0 on hppa-linux this is libgcc_s.so.4.
 SHORTSTDC3:="4"
 .ENDIF
 SHORTSTDCPP3="6"
-- 
cgit v1.2.3