Hello community, here is the log from the commit of package dynamips for openSUSE:Factory checked in at 2012-03-23 12:04:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dynamips (Old) and /work/SRC/openSUSE:Factory/.dynamips.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dynamips", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes 2011-09-23 01:55:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2012-03-23 12:04:56.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 22 11:01:47 UTC 2012 - [email protected] + +- fix ppc and ppc64 builds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dynamips.spec ++++++ --- /var/tmp/diff_new_pack.HFNOLU/_old 2012-03-23 12:04:59.000000000 +0100 +++ /var/tmp/diff_new_pack.HFNOLU/_new 2012-03-23 12:04:59.000000000 +0100 @@ -55,19 +55,10 @@ export CFLAGS export CXXFLAGS -%ifarch x86_64 -%{__make} DYNAMIPS_ARCH=amd64 -%else %{__make} -%endif %install - -%ifarch x86_64 -%{__make} DYNAMIPS_ARCH=amd64 install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} -%else %{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir} -%endif chmod -x README.community %clean @@ -79,4 +70,5 @@ %{_bindir}/dynamips %{_bindir}/nvram_export %{_mandir}/man*/*.gz + %changelog ++++++ dynamips-0.2.8-RC3-make.patch ++++++ --- /var/tmp/diff_new_pack.HFNOLU/_old 2012-03-23 12:04:59.000000000 +0100 +++ /var/tmp/diff_new_pack.HFNOLU/_new 2012-03-23 12:04:59.000000000 +0100 @@ -1,24 +1,42 @@ -diff -uNr old-dynamips-0.2.8-RC3//Makefile dynamips-0.2.8-RC3/Makefile ---- old-dynamips-0.2.8-RC3//Makefile 2011-03-30 15:01:30.000000000 +0200 -+++ dynamips-0.2.8-RC3/Makefile 2011-04-11 16:33:07.451266220 +0200 -@@ -7,9 +7,13 @@ +Index: dynamips-0.2.8-RC3/Makefile +=================================================================== +--- dynamips-0.2.8-RC3.orig/Makefile ++++ dynamips-0.2.8-RC3/Makefile +@@ -5,11 +5,28 @@ + # - 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?=x86 +- -# Do you want to use lib (for 32 bit compiling) or lib64 -export DYNAMIPS_LIB?=lib -#export DYNAMIPS_LIB?=lib64 -+ifeq ($(DYNAMIPS_ARCH), amd64) ++ifeq ($(shell uname -m),i*86) ++DYNAMIPS_ARCH?=x86 ++else ++ifeq ($(shell uname -m),x86_64) ++DYNAMIPS_ARCH?=amd64 ++else ++DYNAMIPS_ARCH?=nojit ++endif ++endif ++ ++ifeq ($(shell uname -m),x86_64) ++DYNAMIPS_LIB?=lib64 ++LIBDIR?=/usr/lib64 ++else ++ifeq ($(shell uname -m),ppc64) +DYNAMIPS_LIB?=lib64 +LIBDIR?=/usr/lib64 +else +DYNAMIPS_LIB?=lib +LIBDIR?=/usr/lib +endif ++endif # For MAC x64 you can compile the "unstable" version, which should work # fine, or use stable if you prefer. -@@ -33,8 +37,6 @@ +@@ -33,8 +50,6 @@ export VERSION_TRAIN=0.2.8 export VERSION_SUB=-RC3 # Executable binary extension @@ -27,7 +45,7 @@ .PHONY: all dynamips.stable dynamips.unstable -@@ -50,13 +52,13 @@ +@@ -50,13 +65,13 @@ dynamips.unstable: install: dynamips.$(DYNAMIPS_CODE) @echo "Installing" @@ -46,26 +64,45 @@ .PHONY: clean -diff -uNr old-dynamips-0.2.8-RC3//stable/Makefile dynamips-0.2.8-RC3/stable/Makefile ---- old-dynamips-0.2.8-RC3//stable/Makefile 2011-03-30 15:01:30.000000000 +0200 -+++ dynamips-0.2.8-RC3/stable/Makefile 2011-04-11 16:33:05.115266219 +0200 -@@ -10,9 +10,13 @@ - DYNAMIPS_ARCH=x86 +Index: dynamips-0.2.8-RC3/stable/Makefile +=================================================================== +--- dynamips-0.2.8-RC3.orig/stable/Makefile ++++ dynamips-0.2.8-RC3/stable/Makefile +@@ -3,15 +3,28 @@ + + # Replace x86 by amd64 for a build on x86_64. + # Use "nojit" for architectures that are not x86 or x86_64. ++ifeq ($(shell uname -m),i*86) + DYNAMIPS_ARCH?=x86 +-#DYNAMIPS_ARCH?=amd64 +- +-ifeq ($(DYNAMIPS_ARCH),ppc32) +-DYNAMIPS_ARCH=x86 ++else ++ifeq ($(shell uname -m),x86_64) ++DYNAMIPS_ARCH?=amd64 ++else ++DYNAMIPS_ARCH?=nojit ++endif endif -# Do you want to use lib (for 32 bit compiling) or lib64 -+ifeq ($(DYNAMIPS_ARCH), amd64) ++ifeq ($(shell uname -m),x86_64) ++DYNAMIPS_LIB?=lib64 ++LIBDIR?=/usr/lib64 ++else ++ifeq ($(shell uname -m),ppc64) +DYNAMIPS_LIB?=lib64 +LIBDIR?=/usr/lib64 +else DYNAMIPS_LIB?=lib -- +LIBDIR?=/usr/lib +endif ++endif + # Get include files from the current directory and from the common directory - INCLUDE+=-I. -I../common -@@ -38,8 +42,6 @@ +@@ -38,8 +51,6 @@ VERSION_DEV=$(VERSION_TRAIN)-$(shell dat VPATH = ../common # Executable binary extension @@ -74,7 +111,7 @@ CC?=gcc LD=ld -@@ -51,7 +53,7 @@ +@@ -51,7 +62,7 @@ MIPS64_ARCH_INC_FILE=\"mips64_$(DYNAMIPS PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\" OSNAME=unknown @@ -83,7 +120,7 @@ -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) \ -@@ -73,11 +75,11 @@ +@@ -73,11 +84,11 @@ ifeq ($(shell uname), FreeBSD) else ifeq ($(shell uname), Linux) PTHREAD_LIBS?=-lpthread @@ -98,7 +135,7 @@ else ifeq ($(shell uname -s), Darwin) OSNAME=Darwin -@@ -103,7 +105,7 @@ +@@ -103,7 +114,7 @@ ifeq ($(shell uname -o), Cygwin) PCAP_LIB=-lpacket -lwpcap else CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64 @@ -107,7 +144,7 @@ endif endif endif -@@ -247,29 +249,29 @@ +@@ -247,29 +258,29 @@ all: $(PROG) nvram_export $(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \ $(LEX_C) $(C_OBJS) $(A_OBJS) @echo "Linking $@" @@ -144,7 +181,7 @@ asmdefs.h: asmdefs$(BIN_EXT) @echo "Building assembly definitions header file" -@@ -281,11 +283,11 @@ +@@ -281,11 +292,11 @@ nvram_export$(BIN_EXT): nvram_export.c install: $(PROG) nvram_export @echo "Installing" @@ -161,7 +198,7 @@ # install -m644 example $(DESTDIR)/etc/dynamips -@@ -312,11 +314,11 @@ +@@ -312,11 +323,11 @@ packdev: .S.o: @echo "Assembling $<" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
