From 17b40c2ee635cfc771bdc56af05dc6beff10e92a1e205d1aa2e32f75cf1dfe75 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Thu, 3 Feb 2011 00:33:10 +0000 Subject: [PATCH] Accepting request 59743 from devel:tools:compiler Accepted submit request 59743 from user coolo OBS-URL: https://build.opensuse.org/request/show/59743 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bin86?expand=0&rev=13 --- bin86.changes | 5 +++ dev86-0.16.17.dif | 91 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/bin86.changes b/bin86.changes index 9c14e50..17df221 100644 --- a/bin86.changes +++ b/bin86.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 31 13:08:11 UTC 2011 - coolo@novell.com + +- fix makefile bug + ------------------------------------------------------------------- Thu Feb 21 21:53:06 CET 2008 - bk@suse.de diff --git a/dev86-0.16.17.dif b/dev86-0.16.17.dif index 8a464b5..c282030 100644 --- a/dev86-0.16.17.dif +++ b/dev86-0.16.17.dif @@ -1,6 +1,8 @@ ---- Makefile -+++ Makefile -@@ -18,7 +18,7 @@ +Index: Makefile +=================================================================== +--- Makefile.orig 2011-01-31 14:05:24.200314716 +0100 ++++ Makefile 2011-01-31 14:05:43.854324546 +0100 +@@ -18,7 +18,7 @@ LIBDIR= $(PREFIX)/lib/bcc INCLDIR= $(PREFIX)/lib/bcc ASLDDIR= $(BINDIR) MANDIR= $(PREFIX)/man @@ -9,9 +11,11 @@ # Some makes take the last of a list as the default ... all: make.fil ---- ar/ar.c -+++ ar/ar.c -@@ -500,7 +500,7 @@ +Index: ar/ar.c +=================================================================== +--- ar/ar.c.orig 2011-01-31 14:05:24.200314716 +0100 ++++ ar/ar.c 2011-01-31 14:05:43.855324398 +0100 +@@ -500,7 +500,7 @@ main (argc, argv) break; default: @@ -20,7 +24,7 @@ } exit (0); -@@ -2003,8 +2003,7 @@ +@@ -2003,8 +2003,7 @@ Usage: %s [d|m|p|q|r|t|x [[abi [position /* Print error message and exit. */ void @@ -30,9 +34,11 @@ { error (s1, s2); exit (1); ---- bcc/bcc.c -+++ bcc/bcc.c -@@ -600,9 +600,13 @@ +Index: bcc/bcc.c +=================================================================== +--- bcc/bcc.c.orig 2011-01-31 14:05:24.200314716 +0100 ++++ bcc/bcc.c 2011-01-31 14:05:43.855324398 +0100 +@@ -600,9 +600,13 @@ void command_reset() { #ifndef MAXPATHLEN @@ -47,7 +53,7 @@ char ** prefix; char * saved_cmd; -@@ -1308,10 +1312,10 @@ +@@ -1308,10 +1312,10 @@ void reset_prefix_path() for(d=s=ptr; d && *s; s=d) { @@ -61,8 +67,10 @@ #endif free(temp); ---- bcc/dbprintf.c -+++ bcc/dbprintf.c +Index: bcc/dbprintf.c +=================================================================== +--- bcc/dbprintf.c.orig 2011-01-31 14:05:24.200314716 +0100 ++++ bcc/dbprintf.c 2011-01-31 14:05:43.856314460 +0100 @@ -1,6 +1,7 @@ #include @@ -71,9 +79,11 @@ #if defined(__STDC__) && !defined(__FIRST_ARG_IN_AX__) #include ---- bootblocks/Makefile -+++ bootblocks/Makefile -@@ -38,7 +38,7 @@ +Index: bootblocks/Makefile +=================================================================== +--- bootblocks/Makefile.orig 2011-01-31 14:05:24.200314716 +0100 ++++ bootblocks/Makefile 2011-01-31 14:05:43.856314460 +0100 +@@ -38,7 +38,7 @@ BOOTBLOCKS=sysboot.v noboot.v skip.v msd EXTRAS=minix.h zimage.s minix_elks.c lsys.c boot_win.c install: makeboot @@ -82,8 +92,10 @@ monitor.com: $(MOBJ) $(CC) $(CFLAGS) $(LDFLAGS) $(MONDEFS) -d $(MOBJ) -o monitor.com -M > monitor.sym ---- dis88/Makefile -+++ dis88/Makefile +Index: dis88/Makefile +=================================================================== +--- dis88/Makefile.orig 2011-01-31 14:05:24.201314489 +0100 ++++ dis88/Makefile 2011-01-31 14:05:43.886623617 +0100 @@ -28,6 +28,7 @@ CFLAGS=-O LDFLAGS= @@ -92,7 +104,7 @@ OBJ = disrel.o dismain.o distabs.o dishand.o disfp.o -@@ -37,8 +38,8 @@ +@@ -37,8 +38,8 @@ dis88: $(OBJ) $(CC) $(LDFLAGS) -o dis88 $(OBJ) install: dis88 @@ -103,9 +115,11 @@ $(OBJ): dis.h a.out.h ---- elksemu/Makefile -+++ elksemu/Makefile -@@ -42,7 +42,7 @@ +Index: elksemu/Makefile +=================================================================== +--- elksemu/Makefile.orig 2011-01-31 14:05:24.201314489 +0100 ++++ elksemu/Makefile 2011-01-31 14:05:43.886623617 +0100 +@@ -42,7 +42,7 @@ dummy: # to redirect. install: elksemu install -d $(DIST)/lib @@ -114,8 +128,10 @@ clean realclean: rm -f $(OBJ) binfmt_elks.o elksemu call_tab.v defn_tab.v efile.h ---- ld/dumps.c -+++ ld/dumps.c +Index: ld/dumps.c +=================================================================== +--- ld/dumps.c.orig 2011-01-31 14:05:24.201314489 +0100 ++++ ld/dumps.c 2011-01-31 14:05:43.887314335 +0100 @@ -2,6 +2,7 @@ /* Copyright (C) 1994 Bruce Evans */ @@ -124,9 +140,11 @@ #include "const.h" #include "obj.h" #include "type.h" ---- makefile.in -+++ makefile.in -@@ -78,7 +78,7 @@ +Index: makefile.in +=================================================================== +--- makefile.in.orig 2011-01-31 14:05:24.201314489 +0100 ++++ makefile.in 2011-01-31 14:05:43.887314335 +0100 +@@ -78,7 +78,7 @@ CFLAGS += -no-cpp-precomp # Install files with the userid of the currently running process. INDAT=-m 644 @@ -135,8 +153,10 @@ INSCR=-m 755 #ifdef __CYGWIN__ ---- as/type.h.mm 2001-06-23 20:01:37.000000000 +0000 -+++ as/type.h 2007-10-02 16:11:08.000000000 +0000 +Index: as/type.h +=================================================================== +--- as/type.h.orig 2011-01-31 14:05:24.201314489 +0100 ++++ as/type.h 2011-01-31 14:05:43.887314335 +0100 @@ -149,7 +149,7 @@ struct macro_s struct sym_listing_s @@ -146,3 +166,16 @@ char zname[2]; char segm[1]; char pad1[1]; +Index: libc/i386sys/Makefile +=================================================================== +--- libc/i386sys/Makefile.orig 2005-01-04 00:00:39.000000000 +0100 ++++ libc/i386sys/Makefile 2011-01-31 14:06:01.595174380 +0100 +@@ -12,7 +12,7 @@ DSRC=dirent.c + DOBJ=opendir.o closedir.o readdir.o + + ifeq ($(LIB_CPU)-$(LIB_OS),i386-ELKS) +-OBJ=$(LOBJ3) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o ++OBJ=$(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o + SYSCALLS=syscalls + + CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)