From owner-svn-ports-head@freebsd.org Wed Jul 1 18:09:20 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 62010358E0D; Wed, 1 Jul 2020 18:09:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49xq4J20YMz4qqK; Wed, 1 Jul 2020 18:09:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 272B4D7D1; Wed, 1 Jul 2020 18:09:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 061I9Kf4089906; Wed, 1 Jul 2020 18:09:20 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 061I9Ksh089905; Wed, 1 Jul 2020 18:09:20 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202007011809.061I9Ksh089905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 1 Jul 2020 18:09:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540986 - head/emulators/qemu-cheri X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/emulators/qemu-cheri X-SVN-Commit-Revision: 540986 X-SVN-Commit-Repository: ports 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.33 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: Wed, 01 Jul 2020 18:09:20 -0000 Author: jhb (src,doc committer) Date: Wed Jul 1 18:09:19 2020 New Revision: 540986 URL: https://svnweb.freebsd.org/changeset/ports/540986 Log: Cleanup a few things in emulators/qemu-cheri. No functional change. - Remove unused pkg-plist and PLIST=/dev/null setting to ignore it. - Remove unused QEMU_SYSTEM_CHERI variable. - Synchronize USES with emulators/qemu a bit. Reviewed by: brooks (maintainer) Approved by: brooks Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D25529 Deleted: head/emulators/qemu-cheri/pkg-plist Modified: head/emulators/qemu-cheri/Makefile Modified: head/emulators/qemu-cheri/Makefile ============================================================================== --- head/emulators/qemu-cheri/Makefile Wed Jul 1 18:06:50 2020 (r540985) +++ head/emulators/qemu-cheri/Makefile Wed Jul 1 18:09:19 2020 (r540986) @@ -26,11 +26,12 @@ GH_TUPLE= CTSRD-CHERI:qemu:${QEMU_COMMIT} \ qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb \ HAS_CONFIGURE= yes -USES= compiler:c11 gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \ - python:build xorg +USES= compiler:c11 gettext-runtime gl gmake gnome iconv:wchar_t perl5 \ + pkgconfig python:build xorg USE_XORG= pixman USE_GNOME+= glib20 libxml2 -USE_GL+= gbm +USE_PERL5= build +USE_GL+= gl ONLY_FOR_ARCHS= amd64 powerpc64 OPTIONS_DEFINE= DOCS @@ -55,8 +56,6 @@ CONFIGURE_ARGS+= \ --localstatedir=/var EXTRA_CFLAGS= -DCHERI_UNALIGNED -QEMU_SYSTEM_CHERI?= qemu-system${PKGNAMESUFFIX} -PLIST= /dev/null PLIST_FILES= bin/qemu-system-cheri128 \ bin/qemu-system-cheri128magic \ bin/qemu-system-riscv64cheri