sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (16a2542d4f673c5c822082afad795b8bd94c8adb)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (16a2542d4f673c5c822082afad795b8bd94c8adb)
- Date: Wed, 17 Oct 2007 17:18:30 -0500
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
utils/vbetool/BUILD | 9 ++++++++-
utils/vbetool/HISTORY | 5 +++++
utils/vbetool/PRE_BUILD | 14 ++++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 16a2542d4f673c5c822082afad795b8bd94c8adb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
vbetool: x86_64 requires CONFIG_IA32_EMULATION and --with-x86emu
diff --git a/utils/vbetool/BUILD b/utils/vbetool/BUILD
index 147ec5f..f2b48df 100755
--- a/utils/vbetool/BUILD
+++ b/utils/vbetool/BUILD
@@ -1,2 +1,9 @@
-LDFLAGS="$LDFLAGS -lz"
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]
+then
+ OPTS="--with-x86emu \
+ $OPTS"
+fi &&
+
+LDFLAGS="$LDFLAGS -lz" &&
+
default_build
diff --git a/utils/vbetool/HISTORY b/utils/vbetool/HISTORY
index a3fd184..1be06cd 100644
--- a/utils/vbetool/HISTORY
+++ b/utils/vbetool/HISTORY
@@ -1,2 +1,7 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: x86_64 requires CONFIG_IA32_EMULATION
+ * BUILD: Pass --with-x86emu on x86_64
+
2007-04-07 David Brown <dmlb2000 AT gmail.com>
* ALL: created spell
+
diff --git a/utils/vbetool/PRE_BUILD b/utils/vbetool/PRE_BUILD
new file mode 100755
index 0000000..aa12ea3
--- /dev/null
+++ b/utils/vbetool/PRE_BUILD
@@ -0,0 +1,14 @@
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]
+then
+ if [[ $(get_kernel_config CONFIG_IA32_EMULATION) != "y" &&
+ $(get_kernel_config CONFIG_IA32_EMULATION) != "m" ]]
+ then
+ message "${PROBLEM_COLOR}You are running x86_64 and need to enable"
\
+ "IA32 emulation support (CONFIG_IA32_EMULATION) in your kernel"
\
+ "for ${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} to"
\
+ "compile.${DEFAULT_COLOR}"
+ return 1
+ fi
+fi &&
+
+default_pre_build
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (16a2542d4f673c5c822082afad795b8bd94c8adb), Eric Sandall, 10/17/2007
Archive powered by MHonArc 2.6.24.