From 7e8aaf50a0bdc722f0799ae30dd0fbaf7667e435 Mon Sep 17 00:00:00 2001 From: Jan Veninga Date: Fri, 26 Sep 2003 14:49:20 +0000 Subject: [PATCH] Jan Veninga: fixed linux24 to use KCC even for sparc64 git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1503 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + .../linux24/99-mkdep-arglist-too-long.patch | 22 ++++++++++ package/base/linux24/arch-ppc-config.patch | 22 ++++++++++ .../base/linux24/arch-sparc64-use-KCC.patch | 42 +++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 package/base/linux24/arch-sparc64-use-KCC.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 0c335879b..186d57fea 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -11,6 +11,7 @@ small mplayer cleanup - removed alsa-xmms (since xmms now includes a ALSA plugin) - Alejandro Mery: linux24 - mkdep: "Argument list too long" fix + - Jan Veninga: fixed linux24 to use KCC also for sparc64 *) 2003-09-24 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/base/linux24/99-mkdep-arglist-too-long.patch b/package/base/linux24/99-mkdep-arglist-too-long.patch index 2c9f6e803..902d6985d 100644 --- a/package/base/linux24/99-mkdep-arglist-too-long.patch +++ b/package/base/linux24/99-mkdep-arglist-too-long.patch @@ -1,3 +1,25 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/linux24/99-mkdep-arglist-too-long.patch +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + --- ./Makefile.orig 2003-09-23 22:19:55.000000000 -0400 +++ ./Makefile 2003-09-23 22:28:29.000000000 -0400 @@ -518,7 +518,9 @@ diff --git a/package/base/linux24/arch-ppc-config.patch b/package/base/linux24/arch-ppc-config.patch index 1eba2ee02..ced4f2e50 100644 --- a/package/base/linux24/arch-ppc-config.patch +++ b/package/base/linux24/arch-ppc-config.patch @@ -1,3 +1,25 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/linux24/arch-ppc-config.patch +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + --- linux-2.4.22/arch/ppc/config.in 2003-08-25 13:44:40.000000000 +0200 +++ linux-2.4.22-fixed/arch/ppc/config.in 2003-09-16 23:42:48.000000000 +0200 @@ -222,8 +222,10 @@ diff --git a/package/base/linux24/arch-sparc64-use-KCC.patch b/package/base/linux24/arch-sparc64-use-KCC.patch new file mode 100644 index 000000000..9f778d80b --- /dev/null +++ b/package/base/linux24/arch-sparc64-use-KCC.patch @@ -0,0 +1,42 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/linux24/arch-sparc64-use-KCC.patch +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + + +An extra kernel patch for sparc so that the sparc64 makefile uses KCC. + + - Jan Veninga + +diff -ruN linux-2.4.22/arch/sparc64/Makefile linux-2.4.22.new/arch/sparc64/Makefile +--- linux-2.4.22/arch/sparc64/Makefile 2003-06-13 16:51:32.000000000 +0200 ++++ linux-2.4.22.new/arch/sparc64/Makefile 2003-09-23 16:11:21.000000000 +0200 +@@ -12,7 +12,7 @@ + # line... + SHELL =/bin/bash + +-CC := $(shell if gcc -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo gcc; else echo sparc64-linux-gcc; fi ) ++CC := $(KCC) + + NEW_GCC := $(shell if $(CC) -m64 -mcmodel=medlow -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo y; else echo n; fi; ) + NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi) + + +