From owner-svn-ports-head@FreeBSD.ORG Thu Jan 16 21:10:20 2014 Return-Path: Delivered-To: svn-ports-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E1A94E3; Thu, 16 Jan 2014 21:10:20 +0000 (UTC) Received: from smtp.kn-bremen.de (gelbbaer.kn-bremen.de [78.46.108.116]) by mx1.freebsd.org (Postfix) with ESMTP id ECC77195F; Thu, 16 Jan 2014 21:10:19 +0000 (UTC) Received: by smtp.kn-bremen.de (Postfix, from userid 10) id 532DA1E007BA; Thu, 16 Jan 2014 22:10:12 +0100 (CET) Received: from enceladus10.kn-bremen.de (noident@localhost [127.0.0.1]) by enceladus10.kn-bremen.de (8.14.5/8.14.5) with ESMTP id s0GL7D8I066469; Thu, 16 Jan 2014 22:07:13 +0100 (CET) (envelope-from nox@enceladus10.kn-bremen.de) Received: (from nox@localhost) by enceladus10.kn-bremen.de (8.14.5/8.14.5/Submit) id s0GL7Dfj066468; Thu, 16 Jan 2014 22:07:13 +0100 (CET) (envelope-from nox) From: Juergen Lock Date: Thu, 16 Jan 2014 22:07:13 +0100 To: Shaun Amott Subject: Re: svn commit: r339966 - in head/emulators: . x49gp x49gp/files Message-ID: <20140116210712.GA66315@enceladus10.kn-bremen.de> References: <201401161931.s0GJV3fI061492@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201401161931.s0GJV3fI061492@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 21:10:20 -0000 On Thu, Jan 16, 2014 at 07:31:03PM +0000, Shaun Amott wrote: > Author: shaun > Date: Thu Jan 16 19:31:03 2014 > New Revision: 339966 > URL: http://svnweb.freebsd.org/changeset/ports/339966 > QAT: https://qat.redports.org/buildarchive/r339966/ > > Log: > Add x49gp - a HP49G+/50G graphics calculator emulator. > > Added: > [...] This looked interesting but it didn't build as is, I got it to work on 10.0-RC5/amd64 with the following patch: - Pass CC to MAKE_ARGS and configure (needed for gcc46 on 10+). - Add -lz -lm to X49GP_LIBS (needed for new ld on 10+). - Copy hp50g-hack.png to hp50g.png for amd64 in startup script. Thanx! :) Juergen Index: emulators/x49gp/Makefile =================================================================== --- emulators/x49gp/Makefile (revision 339973) +++ emulators/x49gp/Makefile (working copy) @@ -15,6 +15,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/x49gp/x49gp-code +HAVE_CONFIGURE= yes USE_GCC= any USE_XORG= x11 @@ -40,6 +41,8 @@ .include +MAKE_ARGS+=CC="${CC}" + .if ${PORT_OPTIONS:MFIRMWARE_215H3} || ${PORT_OPTIONS:MFIRMWARE_215} MAKE_ARGS+=FIRMWARE=4950_215.bin DISTFILES+=hp4950v215.zip @@ -63,6 +66,9 @@ # @${CP} ${WRKDIR}/rom215_hpgcc3_R004/hpgccrom.bin ${WRKSRC}/4950_215.bin #.endif +do-configure: + cd ${WRKSRC}/qemu/qemu-git && ./configure-small --extra-cflags=-DX49GP --cc="${CC}" + do-build: cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} Index: emulators/x49gp/files/hp50g.sh.in =================================================================== --- emulators/x49gp/files/hp50g.sh.in (revision 339973) +++ emulators/x49gp/files/hp50g.sh.in (working copy) @@ -36,6 +36,7 @@ if [ "`uname -p`" = "amd64" ]; then cp "${datadir}/hp50g-hack.png" "${sdir}/" + cp "${datadir}/hp50g-hack.png" "${sdir}/hp50g.png" else cp "${datadir}/hp50g.png" "${sdir}/" fi Index: emulators/x49gp/files/patch-Makefile =================================================================== --- emulators/x49gp/files/patch-Makefile (revision 339973) +++ emulators/x49gp/files/patch-Makefile (working copy) @@ -30,3 +30,11 @@ ifdef QEMU_OLD QEMUSRC = qemu/prepare.sh \ +@@ -81,6 +88,7 @@ QEMU_DIR_BUILD=$(QEMU_DIR)/arm-softmmu + QEMU_DEFINES+=-DNEED_CPU_H + X49GP_LDFLAGS= + X49GP_LIBS= $(QEMU_DIR_BUILD)/exec.o $(QEMU_DIR_BUILD)/translate-all.o $(QEMU_DIR_BUILD)/cpu-exec.o $(QEMU_DIR_BUILD)/translate.o $(QEMU_DIR_BUILD)/fpu/softfloat.o $(QEMU_DIR_BUILD)/op_helper.o $(QEMU_DIR_BUILD)/helper.o $(QEMU_DIR_BUILD)/disas.o $(QEMU_DIR_BUILD)/i386-dis.o $(QEMU_DIR_BUILD)/arm-dis.o $(QEMU_DIR_BUILD)/tcg/tcg.o $(QEMU_DIR_BUILD)/iwmmxt_helper.o $(QEMU_DIR_BUILD)/neon_helper.o ++X49GP_LIBS += -lz -lm + endif + QEMU_INCDIR=$(QEMU_DIR) + QEMU_INC=-I$(QEMU_INCDIR)/target-arm -I$(QEMU_INCDIR) -I$(QEMU_INCDIR)/fpu -I$(QEMU_INCDIR)/arm-softmmu