From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 16 15:00:34 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8826A37B401 for ; Fri, 16 May 2003 15:00:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B68B843FDF for ; Fri, 16 May 2003 15:00:31 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4GM0VUp061164 for ; Fri, 16 May 2003 15:00:31 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4GM0ViP061163; Fri, 16 May 2003 15:00:31 -0700 (PDT) Resent-Date: Fri, 16 May 2003 15:00:31 -0700 (PDT) Resent-Message-Id: <200305162200.h4GM0ViP061163@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Giorgos Keramidas Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 442D137B401 for ; Fri, 16 May 2003 14:57:19 -0700 (PDT) Received: from thalia.otenet.gr (mailsrv.otenet.gr [195.170.0.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F5A543FA3 for ; Fri, 16 May 2003 14:57:18 -0700 (PDT) (envelope-from keramida@ceid.upatras.gr) Received: from gothmog.gr (patr530-a044.otenet.gr [212.205.215.44]) by thalia.otenet.gr (8.12.9/8.12.9) with ESMTP id h4GLvDoA022966 for ; Sat, 17 May 2003 00:57:15 +0300 (EEST) Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.12.9/8.12.9) with ESMTP id h4GJggfj014435 for ; Fri, 16 May 2003 22:42:42 +0300 (EEST) (envelope-from giorgos@gothmog.gr) Received: (from giorgos@localhost) by gothmog.gr (8.12.9/8.12.9/Submit) id h4GJggM4014434; Fri, 16 May 2003 22:42:42 +0300 (EEST) (envelope-from giorgos) Message-Id: <200305161942.h4GJggM4014434@gothmog.gr> Date: Fri, 16 May 2003 22:42:42 +0300 (EEST) From: Giorgos Keramidas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/52347: fix build of emulators/bochs with CPU_LEVEL=4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2003 22:00:34 -0000 >Number: 52347 >Category: ports >Synopsis: fix build of emulators/bochs with CPU_LEVEL=4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 16 15:00:31 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Giorgos Keramidas >Release: FreeBSD 5.1-BETA i386 >Organization: >Environment: System: FreeBSD gothmog.gr 5.1-BETA FreeBSD 5.1-BETA #1: \ Thu May 15 14:02:10 EEST 2003 sysop@gothmog.gr:\ /usr/obj/usr/src/sys/CELERON i386 >Description: Building bochs with processor level < 5 fails because mmx instructions need to be disabled at configure time for such builds. The third chunk of the attached patch fixes this error: ../config.h:719:2: #error With CPU level < 5, you must disable MMX support. gmake[1]: *** [devices.o] Error 1 gmake[1]: Leaving directory `/usr/ports/emulators/bochs/work/bochs-2.0.2/iodev' gmake: *** [iodev/libiodev.a] Error 2 *** Error code 2 I've also added a few more WITH_XXX knobs to enable some of the features of bochs to my local copy. WITH_BOCHS_TERM enables the terminal interface of bochs, WITH_BOCHS_VESA enables VESA BIOS extensions and WITH_BOCHS_READLINE enables readline support. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/bochs/Makefile,v retrieving revision 1.55 diff -u -r1.55 Makefile --- Makefile 14 Apr 2003 01:52:50 -0000 1.55 +++ Makefile 16 May 2003 19:34:40 -0000 @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-split-hd \ - --enable-all-optimizations + --enable-all-optimizations --with-x11 CFLAGS+= -fno-rtti -fno-exceptions -fomit-frame-pointer @@ -36,6 +36,18 @@ .include +.if defined(WITH_BOCHS_TERM) +CONFIGURE_ARGS+= --with-term +.endif + +.if defined(WITH_BOCHS_VESA) +CONFIGURE_ARGS+= --enable-vbe +.endif + +.if defined(WITH_BOCHS_READLINE) +CONFIGURE_ARGS+= --enable-readline +.endif + .if ${XFREE86_VERSION} == 4 BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients @@ -53,6 +65,9 @@ .if ${WITH_BOCHS_CPU_LEVEL} < 3 || ${WITH_BOCHS_CPU_LEVEL} > 6 .error "WITH_BOCHS_CPU_LEVEL must be an integer value between 3 and 6." .endif +.if ${WITH_BOCHS_CPU_LEVEL} < 5 +CONFIGURE_ARGS+= --disable-mmx +.endif CONFIGURE_ARGS+= --enable-cpu-level=${WITH_BOCHS_CPU_LEVEL} .endif @@ -93,7 +108,8 @@ pre-everything:: .if !defined(WITH_BOCHS_CPU_LEVEL) || !defined(WITH_BOCHS_PROCESSORS) || \ !defined(WITH_BOCHS_DEBUGGER) || !defined(WITH_BOCHS_X86_DEBUGGER) || \ - !defined(WITH_SOUND) + !defined(WITH_SOUND) || !defined(WITH_BOCHS_TERM) || \ + !defined(WITH_BOCHS_VESA) || !defined(WITH_BOCHS_READLINE) @${ECHO_MSG} .if !defined(WITH_BOCHS_CPU_LEVEL) @${ECHO_MSG} "If you want to change the processor level to emulate (default is 5, aka Pentium)" @@ -129,6 +145,21 @@ .if !defined(WITH_SOUND) @${ECHO_MSG} "If you want to compile with sound (blaster 16) support." @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SOUND=yes\"" + @${ECHO_MSG} +.endif +.if !defined(WITH_BOCHS_TERM) + @${ECHO_MSG} "If you want to enable the plain text, console-based bochs interface" + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_GUI_TERM=yes\"" + @${ECHO_MSG} +.endif +.if !defined(WITH_BOCHS_VESA) + @${ECHO_MSG} "If you want to enable the VESA BIOS video extensions of bochs," + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_VESA=yes\"" + @${ECHO_MSG} +.endif +.if !defined(WITH_BOCHS_READLINE) + @${ECHO_MSG} "If you want to enable readline support in the bochs command lines," + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_READLINE=yes\"" .endif @${ECHO_MSG} .endif >Release-Note: >Audit-Trail: >Unformatted: