sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 77266 by Juuso Alasuutari for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 77266 by Juuso Alasuutari for review
Date: Wed, 5 Apr 2006 00:35:01 +0100 (BST)

Change 77266 by juuso_alasuutari@juuso_alasuutari-kamayuq on 2006/04/05
00:34:50

build against sorcery kernel, not running kernel. fix bug #10820

Affected files ...

... //sgl/grimoires/devel/display/svgalib/BUILD#5 edit
... //sgl/grimoires/devel/display/svgalib/HISTORY#15 edit
... //sgl/grimoires/devel/display/svgalib/PRE_BUILD#6 edit

Differences ...

==== //sgl/grimoires/devel/display/svgalib/BUILD#5 (xtext) ====

@@ -28,8 +28,7 @@
LDFLAGS='-L../sharedlib' &&

cd kernel/svgalib_helper &&
-if [ `uname -r | cut -d. -f1,2` == "2.6" ]
-then
+if [[ "$(get_kernel_version)" =~ "^2.6" ]]; then
message "${MESSAGE_COLOR}Building for 2.6...${DEFAULT_COLOR}" &&
make
else

==== //sgl/grimoires/devel/display/svgalib/HISTORY#15 (text) ====

@@ -1,3 +1,9 @@
+2006-04-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: sedits to build against sorcery kernel, not running
+ kernel: fixes bug #10820. also made 1 var local.
+ * BUILD: changed conditional to read sorcery not running kernel
+ version
+
2006-03-31 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: apply patch for also newer than 2.6.15 kernels, not
2.6.15 alone

==== //sgl/grimoires/devel/display/svgalib/PRE_BUILD#6 (xtext) ====

@@ -1,11 +1,14 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-S_KERNELRELEASE=get_kernel_version &&
-export S_KERNELRELEASE &&
+# Edit to build against sorcery kernel, not running kernel
+local KER=$(get_kernel_version) &&
+sedit "s:\$(shell uname -r):$KER:g" Makefile.cfg &&
+sedit "s:\$(shell uname -r):$KER:g" kernel/svgalib_helper/Makefile &&
+sedit "s:\$(shell uname -r):$KER:g" \
+ kernel/svgalib_helper/Makefile.alt &&

# Apply patch for kernel versions 2.6.15* and newer
-KER=`get_kernel_version` &&
KER=${KER:0:6} &&
if (( ${KER//\./} > 2614 )); then
patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.15.diff
@@ -18,7 +21,7 @@
sedit 's:<config.h>:\"config.h\":' threeDKit/wrapsurf.c &&

# Put the man pages in their proper location.
-sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile.cfg &&
+sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile.cfg &&

# Disable kernel module support while building stages
sedit 's:installmodule ::' Makefile

[SM-Commit] PERFORCE change 77266 by Juuso Alasuutari for review, Perforce Review Daemon, 04/04/2006