From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QMGUT-0002aI-E9 for garchives@archives.gentoo.org; Tue, 17 May 2011 09:22:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0955B1C290; Tue, 17 May 2011 09:22:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B114A1C290 for ; Tue, 17 May 2011 09:22:39 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E41991B4038 for ; Tue, 17 May 2011 09:22:38 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 820) id 8289420057; Tue, 17 May 2011 09:22:37 +0000 (UTC) From: "Tony Vroon (chainsaw)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, chainsaw@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/dynamips/files: dynamips-0.2.8_rc3-makefile.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: dynamips-0.2.8_rc3-makefile.patch X-VCS-Directories: app-emulation/dynamips/files X-VCS-Committer: chainsaw X-VCS-Committer-Name: Tony Vroon Content-Type: text/plain; charset=utf8 Message-Id: <20110517092237.8289420057@flycatcher.gentoo.org> Date: Tue, 17 May 2011 09:22:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: dad67985e0d4f449d01b0bedb180f24b chainsaw 11/05/17 09:22:37 Added: dynamips-0.2.8_rc3-makefile.patch Log: Version bump to the GNS3 community release. All the hard patching work = done by Jan Bednar in bug #365049; ported to EAPI=3D3. =20 (Portage version: 2.1.9.49/cvs/Linux x86_64) Revision Changes Path 1.1 app-emulation/dynamips/files/dynamips-0.2.8_rc3-make= file.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/dyna= mips/files/dynamips-0.2.8_rc3-makefile.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/dyna= mips/files/dynamips-0.2.8_rc3-makefile.patch?rev=3D1.1&content-type=3Dtex= t/plain Index: dynamips-0.2.8_rc3-makefile.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -uNr dynamips-0.2.8-RC3-community.ORIG//Makefile dynamips-0.2.8-RC3-= community/Makefile --- dynamips-0.2.8-RC3-community.ORIG//Makefile 2011-05-17 10:12:54.77700= 2689 +0100 +++ dynamips-0.2.8-RC3-community/Makefile 2011-05-17 10:13:22.408002704 += 0100 @@ -5,7 +5,7 @@ # - 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?=3Dx86 +export DYNAMIPS_ARCH?=3Dnojit =20 # Do you want to use lib (for 32 bit compiling) or lib64 export DYNAMIPS_LIB?=3Dlib diff -uNr dynamips-0.2.8-RC3-community.ORIG//stable/Makefile dynamips-0.2= .8-RC3-community/stable/Makefile --- dynamips-0.2.8-RC3-community.ORIG//stable/Makefile 2011-05-17 10:12:5= 4.776002689 +0100 +++ dynamips-0.2.8-RC3-community/stable/Makefile 2011-05-17 10:15:53.1430= 02781 +0100 @@ -3,13 +3,9 @@ =20 # Replace x86 by amd64 for a build on x86_64. # Use "nojit" for architectures that are not x86 or x86_64. -DYNAMIPS_ARCH?=3Dx86 +DYNAMIPS_ARCH?=3Dnojit #DYNAMIPS_ARCH?=3Damd64 =20 -ifeq ($(DYNAMIPS_ARCH),ppc32) -DYNAMIPS_ARCH=3Dx86 -endif - # Do you want to use lib (for 32 bit compiling) or lib64 DYNAMIPS_LIB?=3Dlib =20 @@ -51,7 +47,7 @@ PPC32_ARCH_INC_FILE=3D\"ppc32_$(DYNAMIPS_ARCH)_trans.h\" OSNAME=3Dunknown =20 -CFLAGS+=3D $(INCLUDE) -Wall -O3 -fomit-frame-pointer \ +CFLAGS+=3D $(INCLUDE) -Wall -Wno-strict-aliasing \ -DJIT_ARCH=3D\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=3DCPU_$(DYNAMIPS_ARCH) \ -DMIPS64_ARCH_INC_FILE=3D$(MIPS64_ARCH_INC_FILE) \ -DPPC32_ARCH_INC_FILE=3D$(PPC32_ARCH_INC_FILE) \ @@ -247,19 +243,19 @@ $(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \ $(LEX_C) $(C_OBJS) $(A_OBJS) @echo "Linking $@" - @$(CC) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) + @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS) =20 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 $(LDFLAGS) $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS) =20 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 $(LDFLAGS) $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS) =20 rom2c$(BIN_EXT): rom2c.c @echo "Linking $@" - @$(CC) -Wall $(CFLAGS) -o $@ $< $(LIBS) + @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ $< $(LIBS) =20 mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode @./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000 @@ -269,15 +265,17 @@ =20 asmdefs$(BIN_EXT): asmdefs.c mips64.h @echo "Linking $@" - @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c + @$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ asmdefs.c =20 asmdefs.h: asmdefs$(BIN_EXT) @echo "Building assembly definitions header file" @./asmdefs =20 +dev_rom.o: mips64_microcode_dump.inc ppc32_microcode_dump.inc + nvram_export$(BIN_EXT): nvram_export.c @echo "Linking $@" - @$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ $< + @$(CC) $(LDFLAGS) -Wall $(CFLAGS) $(INCLUDE) -o $@ ../common/nvram_expo= rt.c =20 install: $(PROG) nvram_export @echo "Installing"