Making progress on cxx. Installs now. Can't configure

git-svn-id: svn://mattst88.com/svn/compaq-c-overlay@7 8c41e67f-757b-4206-be13-12d8f16ad5be

4 files changed, 29 insertions, 17 deletions

diff --git a/dev-lang/cxx/Manifest b/dev-lang/cxx/Manifest
index 3ec769d..08f5b9f 100644
--- a/dev-lang/cxx/Manifest
+++ b/dev-lang/cxx/Manifest
@@ -1,4 +1,4 @@
-AUX create-comp-config.patch 1773 RMD160 d775c5dd3d0d1c8b7dc994b26ca6d8d0890ff859 SHA1 94c3f5c351577f8869b5299c5f649d9e8673e78c SHA256 6da63f50febc314cc1f0b7b7362ad9548243d5e44b90cf66ab627b7f099867d6
-AUX probe_linux.patch 1069 RMD160 5b02d3bfa325fd643b80b7064e024b026ed700f9 SHA1 871eb3ed764385e43c3f7916dca52f611314b183 SHA256 3206d6e4fd0edf8269e3014240584c47d1762780bac2c0ebcadc7f1798cb11f7
+AUX create-comp-config.patch 2230 RMD160 044deb23aa2dade591199eab6b5780a60a1a3d78 SHA1 8fd4ba761cb5e6c0032a96524f3d209f3d4c6deb SHA256 1e9d1284a2135d594c1c573b2008c0c341c65f5143991f09735dd46e22c5c252
+AUX probe_linux.patch 1069 RMD160 4c3d4632aa2f673afbad4a8a965d46cba124f201 SHA1 16128168a58169786d0772cba7fd0a6ef6a3eb67 SHA256 df82d7346d05f08a631d87c90f4f0579f435464ba32f25af21559402460b83f8
 DIST cxx-6.5.9.31-1.alpha.rpm 10007070 RMD160 b2e4d19481023ff2898c4fa342d375b07c4052d6 SHA1 85251a735bc4a8cae2583e270de4dad7d999c376 SHA256 43719320e7e4eb09812617428fdbd87cba5614a3d844b8040faa7e75e2b8e6b6
-EBUILD cxx-6.5.9.31.ebuild 3747 RMD160 f4288a923431314e6c79cab49e8f0fdfac7df744 SHA1 34a5cf60bafae180d97d43b2d311a65091a852aa SHA256 369ac8f283dc8629da0b33603605e71d929e14c81ec9e4247e5988a0290ea4f3
+EBUILD cxx-6.5.9.31.ebuild 3746 RMD160 35460145eebac7416a6066a80b5527bcc44f708a SHA1 223f59f63c6b074ed09f729739d77e286a0da0de SHA256 bf4744638b606c80ba5c138ac3a645fb1fe9b7a2761679854bbb53582b4232c4
diff --git a/dev-lang/cxx/cxx-6.5.9.31.ebuild b/dev-lang/cxx/cxx-6.5.9.31.ebuild
index 3ed5b78..1ad54d7 100644
--- a/dev-lang/cxx/cxx-6.5.9.31.ebuild
+++ b/dev-lang/cxx/cxx-6.5.9.31.ebuild
@@ -45,7 +45,7 @@ src_compile() {
 	# patch up config script to sort gcc-lib paths last.  Thanks to
 	# Marc Giger for sorting this out
 	epatch ${FILESDIR}/create-comp-config.patch
-	#epatch ${FILESDIR}/probe_linux.patch
+	epatch ${FILESDIR}/probe_linux.patch
 
 	# remove unwanted documentation
 	if ! use doc > /dev/null; then
diff --git a/dev-lang/cxx/files/create-comp-config.patch b/dev-lang/cxx/files/create-comp-config.patch
index f7bab56..0859ce6 100644
--- a/dev-lang/cxx/files/create-comp-config.patch
+++ b/dev-lang/cxx/files/create-comp-config.patch
@@ -1,7 +1,6 @@
-diff -u old/create-comp-config.sh new/create-comp-config.sh
---- usr/lib/compaq/cxx-6.5.9.31/alpha-linux/bin/create-comp-config.sh.old	2008-04-13 16:27:32.000000000 -0400
---- usr/lib/compaq/cxx-6.5.9.31/alpha-linux/bin/create-comp-config.sh		2008-04-13 16:24:57.000000000 -0400
-@@ -342,10 +342,10 @@
+--- usr/lib/compaq/cxx-6.5.9.31/alpha-linux/bin/create-comp-config.sh.old	2008-04-13 21:44:43.000000000 -0400
++++ usr/lib/compaq/cxx-6.5.9.31/alpha-linux/bin/create-comp-config.sh	2008-04-13 21:55:51.000000000 -0400
+@@ -344,10 +344,10 @@
    fi
  fi
  
@@ -16,7 +15,7 @@ diff -u old/create-comp-config.sh new/create-comp-config.sh
  
  #
  # What header and lib dirs should we be using? The ones that the specified
-@@ -354,7 +354,7 @@
+@@ -356,7 +356,7 @@
  PGM="int main(int argc, char **argv) {return 0;}"
  echo "$PGM" > /tmp/${PREFIX}_install$$.c
  GCC_VER=`basename $GCC_PATH`
@@ -25,7 +24,7 @@ diff -u old/create-comp-config.sh new/create-comp-config.sh
             -o /tmp/${PREFIX}_install$$ > /tmp/${PREFIX}_install$$.log 2>&1 || {
      cat - /tmp/${PREFIX}_install$$.log <<- EOF 1>&2
  	Error: gcc -V $GCC_VER failed to compile and link "$PGM".
-@@ -364,8 +364,17 @@
+@@ -366,8 +366,17 @@
  }
  #
  # Get the list of include directories from the list displayed by gcc -v
@@ -34,13 +33,26 @@ diff -u old/create-comp-config.sh new/create-comp-config.sh
 -USR_DIST_INC=`sed -n -e '1,/^\#include <...>/d' -e '/^End of search list/q' -e '/^/p' /tmp/${PREFIX}_install$$.log`
 +USR_DIST_INC=`
 +    sed -n \
-+	-e '1,/^\#include <...>/d' \
-+	-e '/^End of search list/q' \
-+	-e '/gcc-lib/!p' /tmp/${PREFIX}_install$$.log;
++       -e '1,/^\#include <...>/d' \
++       -e '/^End of search list/q' \
++       -e '/gcc-lib/!p' /tmp/${PREFIX}_install$$.log;
 +    sed -n \
-+	-e '1,/^\#include <...>/d' \
-+	-e '/^End of search list/q' \
-+	-e '/gcc-lib/p' /tmp/${PREFIX}_install$$.log`
++       -e '1,/^\#include <...>/d' \
++       -e '/^End of search list/q' \
++       -e '/gcc-lib/p' /tmp/${PREFIX}_install$$.log`
  
  # Get the name of the linker command (ld or collect2), and library directories
  # by examining the way gcc invoked the linker
+@@ -529,10 +538,10 @@
+   PROD_NAME="C"
+ fi
+ 
+-CCC_ROOT=${CPQ_COMP_ROOT}/usr/lib/compaq/${CCC_VERSION}/alpha-linux
++CCC_ROOT=${CPQ_COMP_ROOT}/usr/lib/compaq/${CCC_VERSION%*-1}/alpha-linux
+ 
+ # Put ccc rpm kit version in bin/.version file for use by ccc -V;
+-  echo "Installed as ${CCC_VERSION}" > ${CCC_ROOT}/bin/.version
++  echo "Installed as ${CCC_VERSION%*-1}" > ${CCC_ROOT}/bin/.version
+ 
+ # Put linux distribution identification info in bin/.version file for use 
+ # by ccc -V;
diff --git a/dev-lang/cxx/files/probe_linux.patch b/dev-lang/cxx/files/probe_linux.patch
index 9b9b6d6..c2c4cf4 100644
--- a/dev-lang/cxx/files/probe_linux.patch
+++ b/dev-lang/cxx/files/probe_linux.patch
@@ -1,6 +1,6 @@
 diff -u old/probe_linux.sh new/probe_linux.sh
 --- usr/lib/compaq/cxx-6.5.9.31/alpha-linux/bin/probe_linux.sh.old	2008-04-13 16:27:32.000000000 -0400
-+++ usr/lib/compaq/ccc-6.5.9.31/alpha-linux/bin/probe_linux.sh		2008-04-13 16:24:18.000000000 -0400
++++ usr/lib/compaq/cxx-6.5.9.31/alpha-linux/bin/probe_linux.sh		2008-04-13 16:24:18.000000000 -0400
 @@ -203,6 +203,8 @@
       DIST_OS="Linux"
       if [ -r /etc/kondara-release ]; then