- support for distro CFLAGS

Changed files:
    dynamips-Makefile.patch -> 1.2
    dynamips.spec -> 1.7

diff --git a/dynamips-Makefile.patch b/dynamips-Makefile.patch
index 9c64348cf2186fd93e2b938aaab5fe107215422a..a11c7b1e036a6f0bf129a3a737872683ae48c30a 100644 (file)
--- a/dynamips-Makefile.patch
+++ b/dynamips-Makefile.patch
@@ -1,20 +1,75 @@
---- Makefile~  2006-09-14 12:59:13.000000000 +0200
-+++ Makefile   2007-04-23 12:09:22.000000000 +0200
+--- Makefile   2007-05-26 11:52:33.000000000 +0200
++++ dynamips-0.2.7/Makefile    2007-09-11 21:15:40.508475542 +0200
 @@ -32,7 +32,7 @@
-       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
-       -DHAS_RFC2553=$(HAS_RFC2553)
+ MIPS64_ARCH_INC_FILE=\"mips64_$(DYNAMIPS_ARCH)_trans.h\"
+ PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
  
--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
+-CFLAGS+=-g -Wall -O3 -fomit-frame-pointer \
++CFLAGS+= $(RPM_CFLAGS) -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) \
+@@ -51,9 +51,9 @@
+ else
+ ifeq ($(shell uname), Linux)
+    PTHREAD_LIBS?=-lpthread
+-#   PCAP_LIB=-lpcap
+-   CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
+-   LIBS=-L/usr/lib -L. /usr/lib/libelf.a $(PTHREAD_LIBS)
++   PCAP_LIB=-lpcap
++   CFLAGS+=-I. $(PTHREAD_CFLAGS)
++   LIBS=-L. -lelf $(PTHREAD_LIBS)
+    DESTDIR=/usr
  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 -s), Darwin)
+@@ -201,15 +201,15 @@
+ $(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
+       @echo "Linking $@"
+-      @$(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c $(LIBS)
++      $(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.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
+@@ -219,7 +219,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"
+@@ -227,7 +227,7 @@
+ 
+ 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"
+@@ -261,11 +261,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 $<

diff --git a/dynamips.spec b/dynamips.spec
index da96877cd74e9c78e98df4b425758c021adff056..385fb9c5d7414a060a6e67b2ac94d23e2e8faaf8 100644 (file)
--- a/dynamips.spec
+++ b/dynamips.spec
@@ -2,7 +2,7 @@ Summary:        Cisco 7200 Simulator
 Summary(pl.UTF-8):     Symulator Cisco 7200
 Name:          dynamips
 Version:       0.2.7
-Release:       0.1
+Release:       0.2
 License:       GPL
 Group:         Applications/Emulators
 Source0:       http://www.ipflow.utc.fr/dynamips/%{name}-%{version}.tar.gz
@@ -40,6 +40,7 @@ ARCH=nojit
 %{__make} \
        DYNAMIPS_ARCH=$ARCH \
        CC="%{__cc}" \
+       RPM_CFLAGS="%{rpmcflags}" \
        LD="%{__ld}"
 
 %install