From 3ab00dded2cbcb7189c3589aa146854a31d3f112 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 27 Mar 2007 13:40:54 +0200 Subject: [PATCH] Support gcc-3.4 and crosscompiling on grml64 --- debian/changelog | 7 +++++++ debian/control | 2 +- grml-terminalserver-config | 13 ++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ad5e4ac..eb5639a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-terminalserver (0.86) unstable; urgency=low + + * Support gcc-3.4 and crosscompiling on grml64. Adjusted Depends + corresponding. [Closes: issue175] + + -- Michael Prokop Tue, 27 Mar 2007 13:33:59 +0200 + grml-terminalserver (0.85) unstable; urgency=low * fix for booting memtest86+ over pxelinux diff --git a/debian/control b/debian/control index 5c1ea80..5adf2a1 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: grml-terminalserver Architecture: any -Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.62), dialog, dhcp3-server, atftpd (>=0.7.dfsg-1.2), syslinux, gcc-3.3, ipcalc, ash +Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.62), dialog, dhcp3-server, atftpd (>=0.7.dfsg-1.2), syslinux, gcc-3.3 | gcc-3.4, ipcalc, ash, libc6-dev-i386 [amd64], ia32-libs [amd64] Description: terminalserver for grml This software should netboot grml on other computers over the network. The terminalserver also works with NON-PXE diff --git a/grml-terminalserver-config b/grml-terminalserver-config index aa45405..9417c86 100755 --- a/grml-terminalserver-config +++ b/grml-terminalserver-config @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Gebetsroither # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Don Nov 16 14:39:51 CET 2006 [mika] +# Latest change: Die Mär 27 13:34:47 CEST 2007 [mika] ################################################################################ @@ -529,8 +529,15 @@ title Load config from Tftp server configfile (nd)/menu.lst EOT #execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read - execute "CC=gcc-3.3 ./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read - execute "make -j2 CC=gcc-3.3" warn || read #return 1 + if [ -x /usr/bin/gcc-3.4 ] ; then + CC='gcc-3.4' + else # assume we have gcc-3.3 + CC='gcc-3.3' + fi + [ -r /lib64 ] && CC="$CC -m32" + + execute "CC=$CC ./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read + execute "make -j2 CC=$CC" warn || read #return 1 local st1_="stage1/stage1" local st2_="stage2/stage2" -- 2.1.4