OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-May-2007 19:17:38
Branch: HEAD Handle: 2007052618173701
Modified files:
openpkg-src/dynamips dynamips.patch dynamips.spec
Log:
upgrading package: dynamips 0.2.5 -> 0.2.7
Summary:
Revision Changes Path
1.3 +33 -24 openpkg-src/dynamips/dynamips.patch
1.7 +4 -2 openpkg-src/dynamips/dynamips.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dynamips/dynamips.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 dynamips.patch
--- openpkg-src/dynamips/dynamips.patch 18 Sep 2006 06:04:36 -0000
1.2
+++ openpkg-src/dynamips/dynamips.patch 26 May 2007 17:17:37 -0000
1.3
@@ -1,8 +1,8 @@
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 \
+--- 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
@@ -11,38 +11,47 @@
ifeq ($(shell uname), FreeBSD)
PTHREAD_LIBS?=-pthread
-- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf
$(PTHREAD_CFLAGS)
+- 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)
-+ CFLAGS+=$(PTHREAD_CFLAGS)
+ 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
+- 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
++ 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
+- 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
+ else
+- CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64
- 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
+ endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dynamips/dynamips.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 dynamips.spec
--- openpkg-src/dynamips/dynamips.spec 1 Jan 2007 17:37:38 -0000
1.6
+++ openpkg-src/dynamips/dynamips.spec 26 May 2007 17:17:38 -0000
1.7
@@ -32,8 +32,8 @@
Class: EVAL
Group: Emulator
License: GPL
-Version: 0.2.5
-Release: 20061013
+Version: 0.2.7
+Release: 20070526
# list of sources
Source0: http://www.ipflow.utc.fr/dynamips/dynamips-%{version}.tar.gz
@@ -75,6 +75,8 @@
ix86-* ) DYNAMIPS_ARCH=x86 ;;
amd64-* ) DYNAMIPS_ARCH=x86_64 ;;
esac
+ # simple hack cause of broken Makefile in 0.2.7
+ %{l_make} %{l_mflags -O} {mips64,ppc32}_microcode_dump.inc
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
