Fix Cross-compile

* Makefile: Fix ability to cross compile.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-86

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index 0df6c4d898ca00961297e9b5c8d77ded599c68df..8b9f853be24ae494cf95e8d9a3ebc2c29c67d754 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,10 +1,9 @@
-./0arch-timestamps0    1122611358      1123038744
+./0arch-timestamps0    1123038748      1127716369

 ./BUGS 1109049412      1000991730
 ./COPYING      1109049412      1000991730
 ./BUGS 1109049412      1000991730
 ./COPYING      1109049412      1000991730

-./ChangeLog    1123038655      1123038742
+./ChangeLog    1127716332      1127716364

 ./Config       1109049412      1002101497
 ./INSTALL      1109049412      1000991730
 ./Config       1109049412      1002101497
 ./INSTALL      1109049412      1000991730

-./Makefile     1109049412      1089576723

 ./README       1109049412      1044766458
 ./README.man.patch     1109049412      1000991730
 ./THANKS       1109049412      1006350263
 ./README       1109049412      1044766458
 ./README.man.patch     1109049412      1000991730
 ./THANKS       1109049412      1006350263


@@ -22,18 +21,18 @@
 ./doc/examples/simpleboot.chrp 1109049412      1068017750
 ./doc/examples/yaboot.conf.multi-boot  1109049412      1006348765
 ./doc/examples/yaboot.conf.rs6000      1109049412      1006348765
 ./doc/examples/simpleboot.chrp 1109049412      1068017750
 ./doc/examples/yaboot.conf.multi-boot  1109049412      1006348765
 ./doc/examples/yaboot.conf.rs6000      1109049412      1006348765

-./doc/examples 1123038743      1068017750
+./doc/examples 1127716369      1068017750

 ./doc/yaboot-howto.de.sgml     1109049413      1096186109
 ./doc/yaboot-howto.sgml        1109049413      1096186082
 ./doc/yaboot-howto.de.sgml     1109049413      1096186109
 ./doc/yaboot-howto.sgml        1109049413      1096186082

-./doc  1123038743      1096186109
+./doc  1127716369      1096186109

 ./etc/yaboot.conf      1109049413      1006348765
 ./etc/yaboot.conf      1109049413      1006348765

-./etc  1123038743      1007269243
+./etc  1127716369      1007269243

 ./first/ofboot 1118285749      1065311880
 ./first/ofboot 1118285749      1065311880

-./first        1123038743      1071492158
+./first        1127716369      1071492158

 ./include/asm/elf.h    1109049413      1000991730
 ./include/asm/ppc_asm.tmpl     1109049413      1000991730
 ./include/asm/processor.h      1109049413      1000991730
 ./include/asm/elf.h    1109049413      1000991730
 ./include/asm/ppc_asm.tmpl     1109049413      1000991730
 ./include/asm/processor.h      1109049413      1000991730

-./include/asm  1123038743      1007269243
+./include/asm  1127716369      1007269243

 ./include/bootinfo.h   1109049413      1007200690
 ./include/byteorder.h  1109049413      1000991730
 ./include/cfg.h        1109049413      1007200690
 ./include/bootinfo.h   1109049413      1007200690
 ./include/byteorder.h  1109049413      1000991730
 ./include/cfg.h        1109049413      1007200690


@@ -42,12 +41,12 @@
 ./include/debug.h      1109049413      1007200690
 ./include/errors.h     1109049413      1007200690
 ./include/et/com_err.h 1109049413      1000991731
 ./include/debug.h      1109049413      1007200690
 ./include/errors.h     1109049413      1007200690
 ./include/et/com_err.h 1109049413      1000991731

-./include/et   1123038743      1007269243
+./include/et   1127716369      1007269243

 ./include/ext2fs/bitops.h      1109049413      1003927524
 ./include/ext2fs/ext2_err.h    1109049413      1003927524
 ./include/ext2fs/ext2_io.h     1109049413      1003927524
 ./include/ext2fs/ext2fs.h      1109049413      1003927524
 ./include/ext2fs/bitops.h      1109049413      1003927524
 ./include/ext2fs/ext2_err.h    1109049413      1003927524
 ./include/ext2fs/ext2_io.h     1109049413      1003927524
 ./include/ext2fs/ext2fs.h      1109049413      1003927524

-./include/ext2fs       1123038744      1007269243
+./include/ext2fs       1127716369      1007269243

 ./include/file.h       1109049413      1007200690
 ./include/fs.h 1109049413      1007200690
 ./include/linux/elf.h  1109049413      1000991731
 ./include/file.h       1109049413      1007200690
 ./include/fs.h 1109049413      1007200690
 ./include/linux/elf.h  1109049413      1000991731


@@ -55,12 +54,12 @@
 ./include/linux/iso_fs.h       1109049413      1000991731
 ./include/linux/stat.h 1109049413      1000991731
 ./include/linux/types.h        1109049413      1000991731
 ./include/linux/iso_fs.h       1109049413      1000991731
 ./include/linux/stat.h 1109049413      1000991731
 ./include/linux/types.h        1109049413      1000991731

-./include/linux        1123038744      1007269243
+./include/linux        1127716369      1007269243

 ./include/mac-part.h   1109049413      1007200690
 ./include/md5.h        1109049413      1000991730
 ./include/prom.h       1109049413      1007200690
 ./include/reiserfs/reiserfs.h  1109049413      1025684115
 ./include/mac-part.h   1109049413      1007200690
 ./include/md5.h        1109049413      1000991730
 ./include/prom.h       1109049413      1007200690
 ./include/reiserfs/reiserfs.h  1109049413      1025684115

-./include/reiserfs     1123038744      1025684115
+./include/reiserfs     1127716369      1025684115

 ./include/setjm2.h     1109049413      1000991730
 ./include/setjmp.h     1109049413      1000991730
 ./include/stdlib.h     1109049413      1000991730
 ./include/setjm2.h     1109049413      1000991730
 ./include/setjmp.h     1109049413      1000991730
 ./include/stdlib.h     1109049413      1000991730


@@ -68,12 +67,12 @@
 ./include/swab.h       1109049413      1000991730
 ./include/types.h      1109049413      1000991730
 ./include/xfs/xfs.h    1109049413      1002101334
 ./include/swab.h       1109049413      1000991730
 ./include/types.h      1109049413      1000991730
 ./include/xfs/xfs.h    1109049413      1002101334

-./include/xfs  1123038744      1007269244
+./include/xfs  1127716369      1007269244

 ./include/yaboot.h     1109049413      1007200690
 ./include/amiga-part.h 1116558586      1116558522
 ./include/fdisk-part.h 1120953080      1120952841
 ./include/partition.h  1120953080      1120952841
 ./include/yaboot.h     1109049413      1007200690
 ./include/amiga-part.h 1116558586      1116558522
 ./include/fdisk-part.h 1120953080      1120952841
 ./include/partition.h  1120953080      1120952841

-./include      1123038743      1120952841
+./include      1127716369      1120952841

 ./lib/ctype.c  1109049413      1000991731
 ./lib/libext2fs.a      1109049413      1003927524
 ./lib/malloc.c 1122610545      1007200690
 ./lib/ctype.c  1109049413      1000991731
 ./lib/libext2fs.a      1109049413      1003927524
 ./lib/malloc.c 1122610545      1007200690


@@ -82,40 +81,41 @@
 ./lib/strtol.c 1109049413      1000991731
 ./lib/vsprintf.c       1109049413      1000991731
 ./lib/strstr.c 1119929028      1116476589
 ./lib/strtol.c 1109049413      1000991731
 ./lib/vsprintf.c       1109049413      1000991731
 ./lib/strstr.c 1119929028      1116476589

-./lib  1123038744      1116476589
+./lib  1127716369      1116476589

 ./man/bootstrap.8      1116558691      1000991731
 ./man/mkofboot.8       1116558691      1006348765
 ./man/ofpath.8 1116558691      1000991731
 ./man/bootstrap.8      1116558691      1000991731
 ./man/mkofboot.8       1116558691      1006348765
 ./man/ofpath.8 1116558691      1000991731

-./man/yaboot.conf.5    1116558691      1004256691
+./man/yaboot.conf.5    1125033367      1004256691

 ./man/yabootconfig.8   1116558691      1027929577
 ./man/ybin.8   1116558691      1006348765
 ./man/yabootconfig.8   1116558691      1027929577
 ./man/ybin.8   1116558691      1006348765

-./man/yaboot.8 1122619111      1090699543
-./man  1123038744      1116476667
+./man/yaboot.8 1125032949      1090699543
+./man  1127716369      1116476667

 ./man.patch    1116558699      1006348761
 ./man.patch    1116558699      1006348761

-./second/cache.S       1120952570      1007200690
-./second/cfg.c 1120952570      1007200690
-./second/cmdline.c     1120952570      1032059589
-./second/crt0.S        1120952570      1000991731
-./second/fs.c  1120952570      1032059574
-./second/fs_ext2.c     1120952570      1032059564
-./second/fs_iso.c      1120952570      1007200690
-./second/fs_reiserfs.c 1120952570      1007200690
-./second/fs_xfs.c      1120952570      1032059541
-./second/iso_util.c    1120952570      1003656415
-./second/md5.c 1120952570      1032059532
-./second/prom.c        1120952570      1067937197
-./second/setjmp.S      1120952570      1000991732
-./second/file.c        1122611358      1122611207
-./second/partition.c   1122611358      1122611207
-./second/yaboot.c      1122611358      1122611207
-./second/fs_of.c       1123038648      1123038648
-./second       1123038744      1123038648
+./second/cache.S       1127716272      1007200690
+./second/cfg.c 1127716272      1007200690
+./second/cmdline.c     1127716272      1032059589
+./second/crt0.S        1127716272      1000991731
+./second/fs.c  1127716272      1032059574
+./second/fs_ext2.c     1127716272      1032059564
+./second/fs_iso.c      1127716272      1007200690
+./second/fs_reiserfs.c 1127716272      1007200690
+./second/fs_xfs.c      1127716272      1032059541
+./second/iso_util.c    1127716272      1003656415
+./second/md5.c 1127716272      1032059532
+./second/prom.c        1127716272      1067937197
+./second/setjmp.S      1127716272      1000991732
+./second/file.c        1127716272      1122611207
+./second/partition.c   1127716272      1122611207
+./second/yaboot.c      1127716272      1122611207
+./second/fs_of.c       1127716272      1123038648
+./second       1127716272      1123038648

 ./util/elfextract.c    1109049413      1007303237
 ./util/addnote.c       1109049413      1107321884
 ./util/elfextract.c    1109049413      1007303237
 ./util/addnote.c       1109049413      1107321884

-./util 1123038744      1107321884
-./ybin/mkofboot        1123038744      1073219938
+./util 1127716369      1107321884
+./ybin/mkofboot        1127716369      1073219938

 ./ybin/ofpath  1120448537      1120448442
 ./ybin/yabootconfig    1117166139      1089576743
 ./ybin/ybin    1120448039      1120447943
 ./ybin/ofpath  1120448537      1120448442
 ./ybin/yabootconfig    1117166139      1089576743
 ./ybin/ybin    1120448039      1120447943

-./ybin 1123038744      1120448442
-.      1123038743      1123038741
+./ybin 1127716369      1120448442
+./Makefile     1127716319      1127716319
+.      1127716368      1127716364

diff --git a/ChangeLog b/ChangeLog
index 419af42bb16833df2005f875e6fe26a18b3c01b0..3c6724a2479b6edb30e067579fb8e58bd58ad34f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
 # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 

+2005-09-26 06:32:56 GMT        Ethan Benson <erbenson@alaska.net>      patch-86
+
+    Summary:
+      Fix Cross-compile
+    Revision:
+      yaboot--devel--1.3--patch-86
+
+    * Makefile: Fix ability to cross compile.
+
+    modified files:
+     0arch-timestamps0 ChangeLog Makefile
+
+

 2005-08-03 03:12:29 GMT        Ethan Benson <erbenson@alaska.net>      patch-85
 
     Summary:
 2005-08-03 03:12:29 GMT        Ethan Benson <erbenson@alaska.net>      patch-85
 
     Summary:

diff --git a/Makefile b/Makefile
index dff78ad1c7dd6507d35a9d9621bcf0c332622b31..2271944d330b9c81e36d420693d494dd3809deb6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,14 @@ KERNELADDR   = 0x01400000
 #
 CROSS = 
 
 #
 CROSS = 
 

+CC             := $(CROSS)gcc
+LD             := $(CROSS)ld
+AS             := $(CROSS)as
+OBJCOPY                := $(CROSS)objcopy
+

 # The flags for the yaboot binary.
 #
 # The flags for the yaboot binary.
 #

-YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `gcc -print-file-name=include` -fsigned-char
+YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -print-file-name=include` -fsigned-char

 YBCFLAGS += -DVERSION=\"${VERSION}\"   #"
 YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
 YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
 YBCFLAGS += -DVERSION=\"${VERSION}\"   #"
 YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
 YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)


@@ -94,11 +99,6 @@ OBJS += second/fs_reiserfs.o
 endif
 
 # compilation
 endif
 
 # compilation

-CC             := $(CROSS)gcc
-LD             := $(CROSS)ld
-AS             := $(CROSS)as
-OBJCOPY                := $(CROSS)objcopy
-

 lgcc = `$(CC) -print-libgcc-file-name`
 
 all: yaboot addnote mkofboot
 lgcc = `$(CC) -print-libgcc-file-name`
 
 all: yaboot addnote mkofboot