Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-06-06 12:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from glaubitz/master

Browse Source 
Fix multiple build issues
This commit is contained in:
Laurent Vivier 2017-03-16 12:07:18 +01:00 committed by GitHub
commit 08be6d9c46
9 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -131,7 +131,7 @@ multiboot.bin: tools first vmlinuz second/$(KARCH)-linux-all/second
tools/emile-install -c $(FLOPPY_CONF) multiboot.bin.X tools/emile-install -c $(FLOPPY_CONF) multiboot.bin.X
mv multiboot.bin.X multiboot.bin mv multiboot.bin.X multiboot.bin
ln -s multiboot.bin last.bin ln -s multiboot.bin last.bin
boot.bin: floppy.bin boot.bin: floppy.bin
rm -f last.bin rm -f last.bin
cp floppy.bin boot.bin.X cp floppy.bin boot.bin.X
@ -204,7 +204,7 @@ first-uninstall::
$(MAKE) -C first uninstall $(MAKE) -C first uninstall
second-install:: second-install::
$(MAKE) -C second install $(MAKE) -C second install
second-uninstall:: second-uninstall::
$(MAKE) -C second uninstall $(MAKE) -C second uninstall
@ -270,7 +270,7 @@ tools:: libemile libiso9660 libext2 libgzip libconfig libmap
$(MAKE) -C tools all CROSS_COMPILE=$(CROSS_COMPILE) TARGET=$(NATIVE) $(MAKE) -C tools all CROSS_COMPILE=$(CROSS_COMPILE) TARGET=$(NATIVE)
tools-install:: tools tools-install:: tools
$(MAKE) -C tools install $(MAKE) -C tools install TARGET=$(NATIVE)
tools-uninstall:: tools-uninstall::
$(MAKE) -C tools uninstall $(MAKE) -C tools uninstall

2
debian/compat vendored
View File

@ -1 +1 @@
4 9

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: admin
Priority: optional Priority: optional
Maintainer: Wouter Verhelst <wouter@debian.org> Maintainer: Wouter Verhelst <wouter@debian.org>
Uploaders: Wouter Verhelst <wouter@debian.org>, Stephen R. Marenka <smarenka@debian.org> Uploaders: Wouter Verhelst <wouter@debian.org>, Stephen R. Marenka <smarenka@debian.org>
Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc, e2fslibs-dev Build-Depends: debhelper (>= 9), docbook-to-man, gcc, e2fslibs-dev
Build-Depends-Indep: gcc-4.6-m68k-linux-gnu [!m68k] Build-Depends-Indep: gcc-4.6-m68k-linux-gnu [!m68k]
Standards-Version: 3.7.2 Standards-Version: 3.7.2

4
libunix/Makefile
View File

@ -4,7 +4,7 @@
TOP = $(shell pwd) TOP = $(shell pwd)
CFLAGS += -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 -Os CFLAGS += -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -ffreestanding -fpic -O2 -Os
CPPFLAGS = -I$(TOP) -I$(TOP)/../libmacos -DARCH_M68K CPPFLAGS = -I$(TOP) -I$(TOP)/../libmacos -DARCH_M68K
LIBRARY = libunix.a LIBRARY = libunix.a
@ -14,7 +14,7 @@ SOURCES = divsi3.S modsi3.S mulsi3.S udivsi3.S umodsi3.S free.c malloc.c \
strcpy.c strlen.c strncpy.c vsprintf.c write.c strcmp.c \ strcpy.c strlen.c strncpy.c vsprintf.c write.c strcmp.c \
strncmp.c strtol.c strdup.c strncmp.c strtol.c strdup.c
HEADERS = HEADERS =
all: $(LIBRARY) all: $(LIBRARY)

1
scripts/tools.sh
View File

@ -36,7 +36,6 @@ then
if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1 if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1
then then
echo "Cannot find m68k cross-compiler" 1>&2 echo "Cannot find m68k cross-compiler" 1>&2
exit 1
fi fi
fi fi
M68K_GCC_VERSION=$(${M68K_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null) M68K_GCC_VERSION=$(${M68K_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null)

20
second/Makefile
View File

@ -1,7 +1,7 @@
# #
# #
# (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU> # (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
# #
# #
TARGET = m68k-linux TARGET = m68k-linux
@ -16,7 +16,7 @@ CPPFLAGS = -DVERSION="\"$(VERSION)\"" -I$(TOP) -Wa,-I$(TOP) \
# -O2 is needed to be able to inline functions from libmacos # -O2 is needed to be able to inline functions from libmacos
CFLAGS = $(OPT_CFLAGS) -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 CFLAGS = $(OPT_CFLAGS) -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2
ASFLAGS = ASFLAGS =
LIBS = $(OPT_LIBS) \ LIBS = $(OPT_LIBS) \
-L$(TOP)/../libiso9660/m68k-linux -liso9660 \ -L$(TOP)/../libiso9660/m68k-linux -liso9660 \
-L$(TOP)/../libext2/m68k-linux -lext2 \ -L$(TOP)/../libext2/m68k-linux -lext2 \
@ -128,7 +128,7 @@ $(TARGET)-$(MEDIA)/second::
OPT_CFLAGS="$(CFLAGS_TARGET)" \ OPT_CFLAGS="$(CFLAGS_TARGET)" \
OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \ OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \
OPT_LIBS="$(LIBS_MEDIA)" OPT_LIBS="$(LIBS_MEDIA)"
$(TARGET)-$(MEDIA)-driver/apple_driver:: $(TARGET)-$(MEDIA)-driver/apple_driver::
test -d $(TARGET)-$(MEDIA)-driver || mkdir $(TARGET)-$(MEDIA)-driver test -d $(TARGET)-$(MEDIA)-driver || mkdir $(TARGET)-$(MEDIA)-driver
cd $(TARGET)-$(MEDIA)-driver && make -f $(TOP)/Makefile apple_driver \ cd $(TARGET)-$(MEDIA)-driver && make -f $(TOP)/Makefile apple_driver \
@ -143,7 +143,7 @@ $(TARGET)-$(MEDIA)-driver/apple_driver::
OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \ OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \
OPT_LIBS="$(LIBS_MEDIA)" OPT_LIBS="$(LIBS_MEDIA)"
ifeq ("$(TARGET)", "ppc-linux") ifeq ("$(TARGET)", "ppc-linux")
bootstrapPPC.o: bootstrapPPC.S bootstrapPPC.o: bootstrapPPC.S
$(PPC_CC) $(CPPFLAGS) -c $(TOP)/bootstrapPPC.S -o bootstrapPPC.o $(PPC_CC) $(CPPFLAGS) -c $(TOP)/bootstrapPPC.S -o bootstrapPPC.o
@ -152,7 +152,7 @@ bootstrap: bootstrapPPC.o
-O binary bootstrapPPC.o bootstrap -O binary bootstrapPPC.o bootstrap
switch_to_PPC.o: switch_to_PPC.S bootstrap switch_to_PPC.o: switch_to_PPC.S bootstrap
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
$(OBJCOPY) --add-section .bootstrap=bootstrap \ $(OBJCOPY) --add-section .bootstrap=bootstrap \
--set-section-flags .bootstrap=contents,alloc,load,data \ --set-section-flags .bootstrap=contents,alloc,load,data \
switch_to_PPC.o switch_to_PPC.o
@ -179,10 +179,10 @@ apple_driver.o: $(OBJS) $(TOP)/ld.script
$(LD) -T $(TOP)/ld.script -o apple_driver.o $(OBJS) $(LIBS) $(LD) -T $(TOP)/ld.script -o apple_driver.o $(OBJS) $(LIBS)
.c.o: .c.o:
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
%030.o: %030.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68030 -Wa,-mcpu=68030 -c -o $@ $^ %030.o: %030.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68030 -Wa,-mcpu=68030 -c -o $@ $^
%040.o: %040.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68040 -Wa,-mcpu=68040 -c -o $@ $^ %040.o: %040.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68040 -Wa,-mcpu=68040 -c -o $@ $^
install:: install::
install -d $(DESTDIR)/$(PREFIX)/boot/emile/ install -d $(DESTDIR)/$(PREFIX)/boot/emile/

2
second/console.c
View File

@ -33,7 +33,7 @@ console_init(void)
wait_char = 0; wait_char = 0;
} }
int console_putchar(int c) extern inline int console_putchar(int c)
{ {
switch(selected_console) switch(selected_console)
{ {

2
second/console.h
View File

@ -13,7 +13,7 @@
#include "head.h" #include "head.h"
extern void console_init(void); extern void console_init(void);
extern inline int console_putchar(int c); extern int console_putchar(int c);
extern void console_putstring(const char *s); extern void console_putstring(const char *s);
int wait_char; int wait_char;
#ifdef USE_CLI #ifdef USE_CLI

20
tools/Makefile
View File

@ -11,7 +11,7 @@ PROGRAMS = emile-set-cmdline emile-first-tune emile-install \
iso9660_cat minigzip read_vmlinuz emile-mkisofs \ iso9660_cat minigzip read_vmlinuz emile-mkisofs \
ext2_ls ext2_cat emile-mktable emile-conf ext2_ls ext2_cat emile-mktable emile-conf
SOURCES = emile-set-cmdline.c Makefile emile-first-tune.c \ SOURCES = emile-set-cmdline.c emile-first-tune.c \
emile-install.c emile-set-output.c emile.c \ emile-install.c emile-set-output.c emile.c \
emile_scanbus.c emile-map-set.c iso9660_ls.c \ emile_scanbus.c emile-map-set.c iso9660_ls.c \
iso9660_cat.c minigzip.c read_vmlinuz.c device.c gzio.c \ iso9660_cat.c minigzip.c read_vmlinuz.c device.c gzio.c \
@ -59,15 +59,15 @@ emile-conf: emile-conf.o device.o
install: install:
install -d $(DESTDIR)/$(PREFIX)/sbin/ install -d $(DESTDIR)/$(PREFIX)/sbin/
install emile-set-cmdline $(DESTDIR)/$(PREFIX)/sbin/emile-set-cmdline install $(TARGET)/emile-set-cmdline $(DESTDIR)/$(PREFIX)/sbin/emile-set-cmdline
install emile-first-tune $(DESTDIR)/$(PREFIX)/sbin/emile-first-tune install $(TARGET)/emile-first-tune $(DESTDIR)/$(PREFIX)/sbin/emile-first-tune
install emile-install $(DESTDIR)/$(PREFIX)/sbin/emile-install install $(TARGET)/emile-install $(DESTDIR)/$(PREFIX)/sbin/emile-install
install emile-set-output $(DESTDIR)/$(PREFIX)/sbin/emile-set-output install $(TARGET)/emile-set-output $(DESTDIR)/$(PREFIX)/sbin/emile-set-output
install emile $(DESTDIR)/$(PREFIX)/sbin/emile install $(TARGET)/emile $(DESTDIR)/$(PREFIX)/sbin/emile
install emile-map-set $(DESTDIR)/$(PREFIX)/sbin/emile-map-set install $(TARGET)/emile-map-set $(DESTDIR)/$(PREFIX)/sbin/emile-map-set
install emile-mkisofs $(DESTDIR)/$(PREFIX)/sbin/emile-mkisofs install $(TARGET)/emile-mkisofs $(DESTDIR)/$(PREFIX)/sbin/emile-mkisofs
install emile-mktable $(DESTDIR)/$(PREFIX)/sbin/emile-mktable install $(TARGET)/emile-mktable $(DESTDIR)/$(PREFIX)/sbin/emile-mktable
install emile-conf $(DESTDIR)/$(PREFIX)/sbin/emile-conf install $(TARGET)/emile-conf $(DESTDIR)/$(PREFIX)/sbin/emile-conf
uninstall: uninstall:
rm -f $(DESTDIR)/$(PREFIX)/sbin/emile-set-cmdline rm -f $(DESTDIR)/$(PREFIX)/sbin/emile-set-cmdline