diff options
| author | Matt Turner <mattst88@gmail.com> | 2008-04-13 21:45:28 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2008-04-13 21:45:28 +0000 |
| commit | 19f7f69e746ccd0203fa5f90fa0002572c2e8d7f (patch) | |
| tree | 7e1df4a9f89bca95d14e91753b2233aeeca7e62d /dev-lang/ccc/files | |
| parent | 44b292b8e830e64745692aed5dc10ddfd0ff6899 (diff) | |
Fix up ccc patches, clear libcpml ebuild some
git-svn-id: svn://mattst88.com/svn/compaq-c-overlay@2 8c41e67f-757b-4206-be13-12d8f16ad5be
Diffstat (limited to 'dev-lang/ccc/files')
| -rw-r--r-- | dev-lang/ccc/files/create-comp-config.patch (renamed from dev-lang/ccc/files/update-config.patch) | 41 | ||||
| -rw-r--r-- | dev-lang/ccc/files/probe_linux.patch | 37 |
2 files changed, 39 insertions, 39 deletions
diff --git a/dev-lang/ccc/files/update-config.patch b/dev-lang/ccc/files/create-comp-config.patch index 6733307..9da9ace 100644 --- a/dev-lang/ccc/files/update-config.patch +++ b/dev-lang/ccc/files/create-comp-config.patch @@ -1,6 +1,6 @@ diff -u old/create-comp-config.sh new/create-comp-config.sh ---- old/create-comp-config.sh 2008-04-13 16:27:32.000000000 -0400 -+++ new/create-comp-config.sh 2008-04-13 16:24:57.000000000 -0400 +--- usr/lib/compaq/ccc-6.5.9.001-6/alpha-linux/bin/create-comp-config.sh.old 2008-04-13 16:27:32.000000000 -0400 +--- usr/lib/compaq/ccc-6.5.9.001-6/alpha-linux/bin/create-comp-config.sh 2008-04-13 16:24:57.000000000 -0400 @@ -342,10 +342,10 @@ fi fi @@ -44,40 +44,3 @@ diff -u old/create-comp-config.sh new/create-comp-config.sh # Get the name of the linker command (ld or collect2), and library directories # by examining the way gcc invoked the linker -diff -u old/probe_linux.sh new/probe_linux.sh ---- old/probe_linux.sh 2008-04-13 16:27:32.000000000 -0400 -+++ new/probe_linux.sh 2008-04-13 16:24:18.000000000 -0400 -@@ -203,6 +203,8 @@ - DIST_OS="Linux" - if [ -r /etc/kondara-release ]; then - DIST_VENDOR="kondara" -+ elif [ -r /etc/gentoo-release ]; then -+ DIST_VENDOR="gentoo" - elif [ -r /etc/redhat-release ]; then - DIST_VENDOR="rh" - elif [ -r /etc/SuSE-release ]; then -@@ -249,13 +251,7 @@ - - probe_gcc() - { -- specs=`gcc -v 2>&1 | sed -n -e 's|^[^/]*\(/[^ ]*/specs\).*$|\1|p'` -- -- if [ ! -r $specs ]; then -- GCC_PATH="Unknown GCC" -- else -- GCC_PATH=`dirname $specs` -- fi -+ GCC_PATH=`gcc-config --get-lib-path` - } - - probe_libc() -@@ -326,7 +322,8 @@ - # TASO will return "YES", "NO", or "an error string" - # - TASO="YES" -- -+TASO="NO" -+return - if [ "$DIST_OS" = "Linux" ]; then - # Does ld claim to support taso? - if [ "`ld --help | grep taso`" = "" ]; then diff --git a/dev-lang/ccc/files/probe_linux.patch b/dev-lang/ccc/files/probe_linux.patch new file mode 100644 index 0000000..8b08912 --- /dev/null +++ b/dev-lang/ccc/files/probe_linux.patch @@ -0,0 +1,37 @@ +diff -u old/probe_linux.sh new/probe_linux.sh +--- usr/lib/compaq/ccc-6.5.9.001-6/alpha-linux/bin/probe_linux.sh.old 2008-04-13 16:27:32.000000000 -0400 ++++ usr/lib/compaq/ccc-6.5.9.001-6/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 + DIST_VENDOR="kondara" ++ elif [ -r /etc/gentoo-release ]; then ++ DIST_VENDOR="gentoo" + elif [ -r /etc/redhat-release ]; then + DIST_VENDOR="rh" + elif [ -r /etc/SuSE-release ]; then +@@ -249,13 +251,7 @@ + + probe_gcc() + { +- specs=`gcc -v 2>&1 | sed -n -e 's|^[^/]*\(/[^ ]*/specs\).*$|\1|p'` +- +- if [ ! -r $specs ]; then +- GCC_PATH="Unknown GCC" +- else +- GCC_PATH=`dirname $specs` +- fi ++ GCC_PATH=`gcc-config --get-lib-path` + } + + probe_libc() +@@ -326,7 +322,8 @@ + # TASO will return "YES", "NO", or "an error string" + # + TASO="YES" +- ++TASO="NO" ++return + if [ "$DIST_OS" = "Linux" ]; then + # Does ld claim to support taso? + if [ "`ld --help | grep taso`" = "" ]; then |