- fix building on x32

[packages/dynamips.git] / dynamips-Makefile.patch

diff --git a/dynamips-Makefile.patch b/dynamips-Makefile.patch
index 9c64348cf2186fd93e2b938aaab5fe107215422a..36503b4dfd90daff49b798b33951ce312310af85 100644 (file)
--- a/dynamips-Makefile.patch
+++ b/dynamips-Makefile.patch
@@ -1,20 +1,110 @@
---- Makefile~  2006-09-14 12:59:13.000000000 +0200
-+++ Makefile   2007-04-23 12:09:22.000000000 +0200
-@@ -32,7 +32,7 @@
-       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
-       -DHAS_RFC2553=$(HAS_RFC2553)
- 
--PCAP_LIB=/usr/local/lib/libpcap.a
-+PCAP_LIB=/usr/lib/libpcap.so
- #PCAP_LIB=-lpcap
- 
- ifeq ($(shell uname), FreeBSD)
-@@ -50,7 +50,7 @@
-    PCAP_LIB=-lpacket -lwpcap
+--- dynamips-0.2.8-RC2/Makefile.b      2007-10-14 16:35:38.356723252 +0200
++++ dynamips-0.2.8-RC2/Makefile        2007-10-14 16:42:22.040225336 +0200
+@@ -23,8 +23,13 @@
+ VERSION_DEV=$(VERSION_TRAIN)-$(shell date +%Y%m%d-%H)
+ 
+ # Executable binary extension
+-DESTDIR?=/usr
+-BIN_EXT?=
++
++DESTDIR=
++PREFIX=/usr/local
++BINDIR=$(PREFIX)/bin
++DATADIR=$(PREFIX)/share
++MANDIR=$(DATADIR)/man
++SYSCONFIGDIR=$(PREFIX)/etc
+ 
+ CC?=gcc
+ LD=ld
+@@ -35,7 +40,7 @@
+ MIPS64_ARCH_INC_FILE=\"mips64_$(DYNAMIPS_ARCH)_trans.h\"
+ PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
+ 
+-CFLAGS+=-g -Wall -O3 -fomit-frame-pointer \
++CFLAGS+= $(RPM_CFLAGS) -Wall -fomit-frame-pointer \
+       -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) \
+@@ -56,10 +61,9 @@
  else
-    CFLAGS+=-I/usr/include/libelf
--   LIBS=-L. /usr/lib/libelf.a -lpthread
-+   LIBS=-L. /usr/lib/libelf.so -lpthread
- endif
- endif
- endif
+ ifeq ($(shell uname), Linux)
+    PTHREAD_LIBS?=-lpthread
+-#   PCAP_LIB=-lpcap
+-   CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
+-   LIBS=-L/usr/lib -L. -ldl /usr/lib/libelf.a $(PTHREAD_LIBS)
+-   DESTDIR=/usr
++   PCAP_LIB=-lpcap
++   CFLAGS+=-I. $(PTHREAD_CFLAGS)
++   LIBS=-L. -ldl -lelf $(PTHREAD_LIBS)
+ else
+ ifeq ($(shell uname -s), Darwin)
+    CFLAGS+=-I/usr/local/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
+@@ -218,19 +222,19 @@
+ $(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \
+       $(LEX_C) $(C_OBJS) $(A_OBJS)
+       @echo "Linking $@"
+-      @$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
++      $(CC) -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 $(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 $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS)
+ 
+ rom2c$(BIN_EXT): rom2c.c
+       @echo "Linking $@"
+-      @$(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
++      $(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
+ 
+ mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode
+       @./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000
+@@ -240,7 +244,7 @@
+ 
+ asmdefs$(BIN_EXT): asmdefs.c mips64.h
+       @echo "Linking $@"
+-      @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
++      $(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
+ 
+ asmdefs.h: asmdefs$(BIN_EXT)
+       @echo "Building assembly definitions header file"
+@@ -248,15 +252,15 @@
+ 
+ nvram_export$(BIN_EXT): nvram_export.c
+       @echo "Linking $@"
+-      @$(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
++      $(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
+ 
+ install: $(PROG) nvram_export
+       @echo "Installing"
+-      install -d $(DESTDIR)/bin $(DESTDIR)/man/man1 $(DESTDIR)/man/man7 $(DESTDIR)/etc
+-      install dynamips nvram_export   $(DESTDIR)/bin
+-      install -m644 dynamips.1        $(DESTDIR)/man/man1
+-      install -m644 nvram_export.1    $(DESTDIR)/man/man1
+-      install -m644 hypervisor_mode.7 $(DESTDIR)/man/man7
++      install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)$(SYSCONFIGDIR)/etc
++      install dynamips nvram_export   $(DESTDIR)$(BINDIR)
++      install -m644 dynamips.1        $(DESTDIR)$(MANDIR)/man1
++      install -m644 nvram_export.1    $(DESTDIR)$(MANDIR)/man1
++      install -m644 hypervisor_mode.7 $(DESTDIR)$(MANDIR)/man7
+ # install -m644 example         $(DESTDIR)/etc/dynamips
+ 
+ 
+@@ -282,11 +286,11 @@
+ 
+ .S.o:
+       @echo "Assembling $<"
+-      @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
++      $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
+ 
+ .c.o:
+       @echo "Compiling $<"
+-      @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
++      $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
+ 
+ .l.c:
+       $(LEX) -o$*.c $<