Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (af16f81d209cc2e74ada8697838d622f665fdd7f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (af16f81d209cc2e74ada8697838d622f665fdd7f)
  • Date: Fri, 1 Aug 2008 16:30:32 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

devel/dev86/PRE_BUILD | 2 +-
devel/dev86/dev86-noelks.patch | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit af16f81d209cc2e74ada8697838d622f665fdd7f
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

dev86: disabled the build of elks on x86_64 arch, fixing bug #14160
(I've forgot to add the patch on my last commit ...)

commit d13362c7956d61f5f7ae3fd9d77c2b1e3961289d
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

Revert "dev86: disabled the build of elks on x86_64 arch, fixing bug
#14160"

This reverts commit a9359977e825fe39f1e67f3275aa309d8f95f35d.

diff --git a/devel/dev86/PRE_BUILD b/devel/dev86/PRE_BUILD
index 8e064d5..ab7e2f6 100755
--- a/devel/dev86/PRE_BUILD
+++ b/devel/dev86/PRE_BUILD
@@ -3,7 +3,7 @@ cd "$SOURCE_DIRECTORY" &&

# fix for bug 14160
if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
- patch -p1 < $SCRIPT_DIRECTORY/dev86-noelks.patch
+ patch -p1 < $SCRIPT_DIRECTORY/dev86-noelks.patch
fi &&

sed -i "s|-O2|$CFLAGS|" Makefile &&
diff --git a/devel/dev86/dev86-noelks.patch b/devel/dev86/dev86-noelks.patch
new file mode 100644
index 0000000..9fd46e9
--- /dev/null
+++ b/devel/dev86/dev86-noelks.patch
@@ -0,0 +1,15 @@
+--- dev86-0.16.17/makefile.in.noelks 2006-01-25 17:03:02.000000000 -0500
++++ dev86-0.16.17/makefile.in 2006-01-25 17:03:19.000000000 -0500
+@@ -89,10 +89,10 @@
+
+ #ifdef GNUMAKE
+ all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \
+- library lib-bsd alt-libs elksemu
++ library lib-bsd alt-libs
+
+ install: check_config install-bcc install-man \
+- install-lib install-emu
++ install-lib
+
+ install-all: install install-other
+



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (af16f81d209cc2e74ada8697838d622f665fdd7f), Julien ROZO, 08/01/2008

Archive powered by MHonArc 2.6.24.

Top of Page