svn commit: r339995 - in head/emulators/x49gp: . files

[Shaun Amott]

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 <bsd.port.options.mk>
 
+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