From owner-svn-ports-head@FreeBSD.ORG Thu Jan 16 22:39:45 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66AF6C75; Thu, 16 Jan 2014 22:39:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3833D10CC; Thu, 16 Jan 2014 22:39:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GMdjV1035605; Thu, 16 Jan 2014 22:39:45 GMT (envelope-from shaun@svn.freebsd.org) Received: (from shaun@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GMdiOb035602; Thu, 16 Jan 2014 22:39:44 GMT (envelope-from shaun@svn.freebsd.org) Message-Id: <201401162239.s0GMdiOb035602@svn.freebsd.org> From: Shaun Amott Date: Thu, 16 Jan 2014 22:39:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339995 - in head/emulators/x49gp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 22:39:45 -0000 Author: shaun Date: Thu Jan 16 22:39:44 2014 New Revision: 339995 URL: http://svnweb.freebsd.org/changeset/ports/339995 QAT: https://qat.redports.org/buildarchive/r339995/ Log: Fix build on 10.0-RC5/amd64. Submitted by: nox Modified: head/emulators/x49gp/Makefile head/emulators/x49gp/files/hp50g.sh.in head/emulators/x49gp/files/patch-Makefile Modified: head/emulators/x49gp/Makefile ============================================================================== --- head/emulators/x49gp/Makefile Thu Jan 16 22:19:48 2014 (r339994) +++ head/emulators/x49gp/Makefile Thu Jan 16 22:39:44 2014 (r339995) @@ -15,6 +15,7 @@ COMMENT= HP 49g+/50g graphics calculator EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/x49gp/x49gp-code +HAVE_CONFIGURE= yes USE_GCC= any USE_XORG= x11 @@ -40,6 +41,8 @@ MAKE_ENV+= DEBUGB=1 .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 @@ post-patch: # @${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} Modified: head/emulators/x49gp/files/hp50g.sh.in ============================================================================== --- head/emulators/x49gp/files/hp50g.sh.in Thu Jan 16 22:19:48 2014 (r339994) +++ head/emulators/x49gp/files/hp50g.sh.in Thu Jan 16 22:39:44 2014 (r339995) @@ -35,7 +35,7 @@ if [ ! -d "${sdir}" ]; then cp "${datadir}/flash-50g" "${sdir}/" 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 Modified: head/emulators/x49gp/files/patch-Makefile ============================================================================== --- head/emulators/x49gp/files/patch-Makefile Thu Jan 16 22:19:48 2014 (r339994) +++ head/emulators/x49gp/files/patch-Makefile Thu Jan 16 22:39:44 2014 (r339995) @@ -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