r1381 - in trunk: . colo

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Feb 2 08:53:05 PST 2006


Author: jim
Date: 2006-02-02 09:53:05 -0700 (Thu, 02 Feb 2006)
New Revision: 1381

Added:
   trunk/colo/colo-1.21-make_fix-1.patch
Modified:
   trunk/
Log:
 r1398 at server:  jim | 2006-02-02 07:56:52 -0800
 Updated:  colo-1.21-make_fix-1.patch



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1396
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1398

Added: trunk/colo/colo-1.21-make_fix-1.patch
===================================================================
--- trunk/colo/colo-1.21-make_fix-1.patch	                        (rev 0)
+++ trunk/colo/colo-1.21-make_fix-1.patch	2006-02-02 16:53:05 UTC (rev 1381)
@@ -0,0 +1,57 @@
+Submitted By: Joe Ciccone <joeciccone at crazyeyesoft.com>
+Date: 2005-11-23
+Initial Package Version: 1.19
+Upstream Status: Sent
+Origin: Joe Ciccone <joeciccone at crazyeyesoft.com
+Description: Adds flags to the stage1, stage2, and chain Makefiles
+             forcing them to build as 32bit.
+
+	     2-2-06 Updated for Colo 1.21 
+diff -Naur colo-1.21.orig/chain/Makefile colo-1.21/chain/Makefile
+--- colo-1.21.orig/chain/Makefile	2006-01-17 23:03:58.000000000 +0000
++++ colo-1.21/chain/Makefile	2006-02-02 15:43:32.000000000 +0000
+@@ -18,9 +18,9 @@
+ 
+ DEPS=$(OBJS:.o=.d)
+ 
+-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= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
++CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+ 
+ all:
+ 	$(MAKE) -C .. binary
+diff -Naur colo-1.21.orig/stage1/Makefile colo-1.21/stage1/Makefile
+--- colo-1.21.orig/stage1/Makefile	2006-01-17 23:03:58.000000000 +0000
++++ colo-1.21/stage1/Makefile	2006-02-02 15:44:18.000000000 +0000
+@@ -21,9 +21,9 @@
+ 
+ DEPS=$(OBJS:.o=.d)
+ 
+-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= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
++CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+ 
+ all:
+ 	$(MAKE) -C .. binary
+diff -Naur colo-1.21.orig/stage2/Makefile colo-1.21/stage2/Makefile
+--- colo-1.21.orig/stage2/Makefile	2006-01-17 23:03:58.000000000 +0000
++++ colo-1.21/stage2/Makefile	2006-02-02 15:44:02.000000000 +0000
+@@ -54,9 +54,9 @@
+ 
+ DEPS=$(OBJS:.o=.d)
+ 
+-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= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
++CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+ 
+ LOADADDR= $(shell $(CROSS_COMPILE)readelf -l $(TARG) | awk '$$1 ~ /^LOAD$$/ { print $$3 }')
+ 




More information about the patches mailing list