r1437 - in trunk: . bin86

ken at linuxfromscratch.org ken at linuxfromscratch.org
Tue Mar 7 13:12:17 PST 2006


Author: ken
Date: 2006-03-07 14:12:16 -0700 (Tue, 07 Mar 2006)
New Revision: 1437

Added:
   trunk/bin86/
   trunk/bin86/bin86-0.16.17-x86_64-1.patch
Log:
Getting ready for lilo on x86_64-64

Added: trunk/bin86/bin86-0.16.17-x86_64-1.patch
===================================================================
--- trunk/bin86/bin86-0.16.17-x86_64-1.patch	                        (rev 0)
+++ trunk/bin86/bin86-0.16.17-x86_64-1.patch	2006-03-07 21:12:16 UTC (rev 1437)
@@ -0,0 +1,44 @@
+Submitted By: Ken Moffat <ken at kenmoffat.uklinux.net>
+Date: 2005-06-28
+Initial Package Version: 0.16.14
+Upstream Status: Submitted Upstream
+Origin: from ROCK Linux
+Description: Allows bin86 to compile on x86_64, which permits lilo to
+ be used in a 64-bit system.  I'm dubious about ROCK's attempts to
+ automatically add dual-licensing to all their patches, but bin86 is
+ already GPL'd.  I've heard from the maintainer that this will be
+ included in the next upload.
+
+
+# --- 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/x86/bin86/x86_64.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
+--- bin86-0.16.14-orig/ld/x86_aout.h	2004-11-07 20:07:31.506442000 +0100
++++ bin86-0.16.14/ld/x86_aout.h	2004-11-07 20:07:41.106982496 +0100
+@@ -12,6 +12,9 @@
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+ #define __OUT_OK 1
++#elif defined(__x86_64__)
++typedef int Long;
++#define __OUT_OK 1
+ #else
+ typedef char Long[4];
+ #endif




More information about the patches mailing list