diff options
Diffstat (limited to 'app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch')
| -rw-r--r-- | app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch deleted file mode 100644 index ad74cfa25007..000000000000 --- a/app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -uNr dynamips-0.2.8-RC3-community.ORIG//Makefile dynamips-0.2.8-RC3-community/Makefile ---- dynamips-0.2.8-RC3-community.ORIG//Makefile 2011-05-17 10:12:54.777002689 +0100 -+++ dynamips-0.2.8-RC3-community/Makefile 2011-05-17 10:13:22.408002704 +0100 -@@ -5,7 +5,7 @@ - # - Use "amd64" for a build on x86_64 (64-bits) - # - Use "ppc32" for a build on powerpc (32-bits) - # - Use "nojit" for unsupported architectures. --export DYNAMIPS_ARCH?=x86 -+export DYNAMIPS_ARCH?=nojit - - # Do you want to use lib (for 32 bit compiling) or lib64 - export DYNAMIPS_LIB?=lib -diff -uNr dynamips-0.2.8-RC3-community.ORIG//stable/Makefile dynamips-0.2.8-RC3-community/stable/Makefile ---- dynamips-0.2.8-RC3-community.ORIG//stable/Makefile 2011-05-17 10:12:54.776002689 +0100 -+++ dynamips-0.2.8-RC3-community/stable/Makefile 2011-05-17 10:15:53.143002781 +0100 -@@ -3,13 +3,9 @@ - - # Replace x86 by amd64 for a build on x86_64. - # Use "nojit" for architectures that are not x86 or x86_64. --DYNAMIPS_ARCH?=x86 -+DYNAMIPS_ARCH?=nojit - #DYNAMIPS_ARCH?=amd64 - --ifeq ($(DYNAMIPS_ARCH),ppc32) --DYNAMIPS_ARCH=x86 --endif -- - # Do you want to use lib (for 32 bit compiling) or lib64 - DYNAMIPS_LIB?=lib - -@@ -51,7 +47,7 @@ - PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\" - OSNAME=unknown - --CFLAGS+= $(INCLUDE) -Wall -O3 -fomit-frame-pointer \ -+CFLAGS+= $(INCLUDE) -Wall -Wno-strict-aliasing \ - -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \ - -DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \ - -DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \ -@@ -247,19 +243,19 @@ - $(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \ - $(LEX_C) $(C_OBJS) $(A_OBJS) - @echo "Linking $@" -- @$(CC) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) -+ @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) - - udp_send$(BIN_EXT): udp_send.c net.c crc.c - @echo "Linking $@" -- @$(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS) -+ @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS) - - udp_recv$(BIN_EXT): udp_recv.c net.c crc.c - @echo "Linking $@" -- @$(CC) -Wall $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS) -+ @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS) - - rom2c$(BIN_EXT): rom2c.c - @echo "Linking $@" -- @$(CC) -Wall $(CFLAGS) -o $@ $< $(LIBS) -+ @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ $< $(LIBS) - - mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode - @./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000 -@@ -269,15 +265,17 @@ - - asmdefs$(BIN_EXT): asmdefs.c mips64.h - @echo "Linking $@" -- @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c -+ @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ asmdefs.c - - asmdefs.h: asmdefs$(BIN_EXT) - @echo "Building assembly definitions header file" - @./asmdefs - -+dev_rom.o: mips64_microcode_dump.inc ppc32_microcode_dump.inc -+ - nvram_export$(BIN_EXT): nvram_export.c - @echo "Linking $@" -- @$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ $< -+ @$(CC) $(LDFLAGS) -Wall $(CFLAGS) $(INCLUDE) -o $@ ../common/nvram_export.c - - install: $(PROG) nvram_export - @echo "Installing" |