Author: jim
Date: 2005-12-30 21:38:58 -0700 (Fri, 30 Dec 2005)
New Revision: 1318
Added:
trunk/colo/colo-1.16-make_fix-1.patch
Modified:
trunk/
Log:
[EMAIL PROTECTED]: jim | 2005-12-30 20:38:40 -0800
Added: colo-1.16-make_fix-1.patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1624
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1626
Added: trunk/colo/colo-1.16-make_fix-1.patch
===================================================================
--- trunk/colo/colo-1.16-make_fix-1.patch 2005-12-27 18:27:07 UTC (rev
1317)
+++ trunk/colo/colo-1.16-make_fix-1.patch 2005-12-31 04:38:58 UTC (rev
1318)
@@ -0,0 +1,56 @@
+Submitted By: Joe Ciccone <[EMAIL PROTECTED]>
+Date: 2005-11-23
+Initial Package Version: 1.19
+Upstream Status: Sent
+Origin: Joe Ciccone <[EMAIL PROTECTED]
+Description: Adds flags to the stage1, stage2, and chain Makefiles
+ forcing them to build as 32bit.
+
+diff -Naur colo-1.19.orig/chain/Makefile colo-1.19/chain/Makefile
+--- colo-1.19.orig/chain/Makefile 2004-10-26 10:27:01.000000000 +0000
++++ colo-1.19/chain/Makefile 2005-11-23 23:24:28.000000000 +0000
+@@ -15,9 +15,9 @@
+
+ include ../Rules.mak
+
+-LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
+-CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2
-fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
+-CPPFLAGS= -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
++CFLAGS= -mabi=32 -Wall -Wstrict-prototypes -fomit-frame-pointer -O2
-fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+
+ all:
+ $(MAKE) -C .. binary
+diff -Naur colo-1.19.orig/stage1/Makefile colo-1.19/stage1/Makefile
+--- colo-1.19.orig/stage1/Makefile 2004-10-26 10:27:01.000000000 +0000
++++ colo-1.19/stage1/Makefile 2005-11-23 23:24:44.000000000 +0000
+@@ -18,9 +18,9 @@
+
+ include ../Rules.mak
+
+-LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
+-CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2
-fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
+-CPPFLAGS= -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
++CFLAGS= -mabi=32 -Wall -Wstrict-prototypes -fomit-frame-pointer -O2
-fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+
+ all:
+ $(MAKE) -C .. binary
+diff -Naur colo-1.19.orig/stage2/Makefile colo-1.19/stage2/Makefile
+--- colo-1.19.orig/stage2/Makefile 2005-03-20 18:27:16.000000000 +0000
++++ colo-1.19/stage2/Makefile 2005-11-23 23:24:10.000000000 +0000
+@@ -52,9 +52,9 @@
+
+ include ../Rules.mak
+
+-LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
+-CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2
-fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
+-CPPFLAGS= -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
++CFLAGS= -mabi=32 -Wall -Wstrict-prototypes -fomit-frame-pointer -O2
-fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+
+ LOADADDR= $(shell $(CROSS_COMPILE)readelf -l $(TARG) | awk '$$1 ~ /^LOAD$$/ {
print $$3 }')
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
