head 1.3; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.2.2.2 OPENPKG_E1_FP:1.2.2.2 OPENPKG_2_STABLE_MP:1.2 OPENPKG_2_STABLE_20061018:1.2.2.2 OPENPKG_2_STABLE:1.2.0.2; locks; strict; comment @# @; 1.3 date 2007.05.26.17.17.37; author cs; state Exp; branches; next 1.2; commitid Vr9Cz1pQBhKWGsjs; 1.2 date 2006.09.18.06.04.36; author rse; state Exp; branches 1.2.2.1; next 1.1; commitid Lx6yRFUBFsYg0hNr; 1.1 date 2006.09.17.20.21.41; author robert; state Exp; branches; next ; commitid zKw9ZPncNAijMdNr; 1.2.2.1 date 2006.09.18.06.04.36; author rse; state dead; branches; next 1.2.2.2; commitid iZxwRSmmWscPXUQr; 1.2.2.2 date 2006.10.16.14.49.46; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.3 log @upgrading package: dynamips 0.2.5 -> 0.2.7 @ text @Index: Makefile --- Makefile.orig 2007-05-26 11:52:33 +0200 +++ Makefile 2007-05-26 18:54:15 +0200 @@@@ -40,42 +40,31 @@@@ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -DHAS_RFC2553=$(HAS_RFC2553) -PCAP_LIB=/usr/local/lib/libpcap.a -#PCAP_LIB=-lpcap +PCAP_LIB?=/usr/local/lib/libpcap.a ifeq ($(shell uname), FreeBSD) PTHREAD_LIBS?=-pthread - CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) \ + CFLAGS+=$(PTHREAD_CFLAGS) \ -D_FILE_OFFSET_BITS=64 - LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) + LIBS+=-L. -lelf $(PTHREAD_LIBS) 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) - DESTDIR=/usr + CFLAGS+=-mdynamic-no-pic $(PTHREAD_CFLAGS) + LIBS+=-lelf $(PTHREAD_LIBS) else ifeq ($(shell uname -s), Darwin) - CFLAGS+=-I/usr/local/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64 - LIBS=-L/usr/local/lib -L. -lelf -lpthread + CFLAGS+=-mdynamic-no-pic -D_FILE_OFFSET_BITS=64 + LIBS+=-lelf -lpthread else ifeq ($(shell uname -s), SunOS) - CFLAGS+=-I/usr/local/include -DINADDR_NONE=0xFFFFFFFF \ - -I /opt/csw/include -DSUNOS - LIBS=-L/usr/local/lib -L. -lelf -lpthread -L/opt/csw/lib \ + CFLAGS+=-DINADDR_NONE=0xFFFFFFFF \ + -DSUNOS + LIBS+=-lelf -lpthread \ -lsocket -lnsl -lresolv - PCAP_LIB=/opt/csw/lib/libpcap.a -else -ifeq ($(shell uname -o), Cygwin) - CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN \ - -D_FILE_OFFSET_BITS=64 - LIBS=-L/usr/local/lib -L. -lelf -lpthread - PCAP_LIB=-lpacket -lwpcap else - CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64 - LIBS=-L. /usr/lib/libelf.a -lpthread -endif + LIBS+=-lpthread endif endif endif @ 1.2 log @use the Wiki page as the homepage; shorten the Vendor header; class can be EVAL as the packaging is ok; adjust style of library dependencies; add missing GNU make dependency; be more descriptive in %description; use 0-prefix/non-version-hardcoded patch; fix building under NOJIT; enable JIT on X86/AMD64 only; install manual pages, too @ text @d2 4 a5 4 --- Makefile.orig 2006-09-14 12:59:13 +0200 +++ Makefile 2006-09-18 07:56:47 +0200 @@@@ -32,26 +32,18 @@@@ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ d14 3 a16 1 - CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) a17 1 + CFLAGS+=$(PTHREAD_CFLAGS) d20 9 d30 1 a30 1 - CFLAGS+=-I/usr/local/include -mdynamic-no-pic d32 1 a32 1 + CFLAGS+=-mdynamic-no-pic d35 10 d46 2 a47 1 - CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN d50 2 a51 2 -else - CFLAGS+=-I/usr/include/libelf d57 1 a57 13 Index: nojit_trans.h --- nojit_trans.h.orig 2006-09-14 12:59:13 +0200 +++ nojit_trans.h 2006-09-18 07:57:58 +0200 @@@@ -38,7 +38,7 @@@@ void mips64_emit_breakpoint(insn_block_t *b); /* Emit unhandled instruction code */ -int mips64_emit_invalid_delay_slot(insn_block_t *b); +void mips64_emit_invalid_delay_slot(insn_block_t *b); /* * Increment count register and trigger the timer IRQ if value in compare @ 1.2.2.1 log @file dynamips.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:46 +0000 @ text @d1 48 @ 1.2.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 48 Index: Makefile --- Makefile.orig 2006-09-14 12:59:13 +0200 +++ Makefile 2006-09-18 07:56:47 +0200 @@@@ -32,26 +32,18 @@@@ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -DHAS_RFC2553=$(HAS_RFC2553) -PCAP_LIB=/usr/local/lib/libpcap.a -#PCAP_LIB=-lpcap +PCAP_LIB?=/usr/local/lib/libpcap.a ifeq ($(shell uname), FreeBSD) PTHREAD_LIBS?=-pthread - CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) - LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) + CFLAGS+=$(PTHREAD_CFLAGS) + LIBS+=-L. -lelf $(PTHREAD_LIBS) else ifeq ($(shell uname -s), Darwin) - CFLAGS+=-I/usr/local/include -mdynamic-no-pic - LIBS=-L/usr/local/lib -L. -lelf -lpthread + CFLAGS+=-mdynamic-no-pic + LIBS+=-lelf -lpthread else -ifeq ($(shell uname -o), Cygwin) - CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN - LIBS=-L/usr/local/lib -L. -lelf -lpthread - PCAP_LIB=-lpacket -lwpcap -else - CFLAGS+=-I/usr/include/libelf - LIBS=-L. /usr/lib/libelf.a -lpthread -endif + LIBS+=-lpthread endif endif Index: nojit_trans.h --- nojit_trans.h.orig 2006-09-14 12:59:13 +0200 +++ nojit_trans.h 2006-09-18 07:57:58 +0200 @@@@ -38,7 +38,7 @@@@ void mips64_emit_breakpoint(insn_block_t *b); /* Emit unhandled instruction code */ -int mips64_emit_invalid_delay_slot(insn_block_t *b); +void mips64_emit_invalid_delay_slot(insn_block_t *b); /* * Increment count register and trigger the timer IRQ if value in compare @ 1.1 log @new package: Cisco 7200 Simulator @ text @d1 3 a3 2 --- dynamips-0.2.5-RC5/Makefile.orig 2006-09-04 23:34:03 +0200 +++ dynamips-0.2.5-RC5/Makefile 2006-09-08 11:09:51 +0200 d37 12 @