diff options
Diffstat (limited to 'dev-lang/cxx/files')
| -rw-r--r-- | dev-lang/cxx/files/create-comp-config.patch | 36 | ||||
| -rw-r--r-- | dev-lang/cxx/files/probe_linux.patch | 2 |
2 files changed, 25 insertions, 13 deletions
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 |