From owner-svn-ports-all@freebsd.org Mon May 11 12:20:39 2020 Return-Path: Delivered-To: svn-ports-all@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 C49632E028C; Mon, 11 May 2020 12:20:39 +0000 (UTC) (envelope-from hselasky@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) server-signature RSA-PSS (4096 bits) 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 49LKlW4t4Nz4Ty3; Mon, 11 May 2020 12:20:39 +0000 (UTC) (envelope-from hselasky@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 A29681E473; Mon, 11 May 2020 12:20:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04BCKd2W092942; Mon, 11 May 2020 12:20:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04BCKdwW092941; Mon, 11 May 2020 12:20:39 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202005111220.04BCKdwW092941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 11 May 2020 12:20:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534909 - head/multimedia/webcamd X-SVN-Group: ports-head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/multimedia/webcamd X-SVN-Commit-Revision: 534909 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2020 12:20:39 -0000 Author: hselasky Date: Mon May 11 12:20:39 2020 New Revision: 534909 URL: https://svnweb.freebsd.org/changeset/ports/534909 Log: Fix setting COMPAT32 option when building 64-bit platforms. Suggested by: jbeich@ and mat@ PR: 245698 Approved by: pi (implicit) Modified: head/multimedia/webcamd/Makefile Modified: head/multimedia/webcamd/Makefile ============================================================================== --- head/multimedia/webcamd/Makefile Mon May 11 11:15:14 2020 (r534908) +++ head/multimedia/webcamd/Makefile Mon May 11 12:20:39 2020 (r534909) @@ -19,17 +19,20 @@ MAKE_ARGS= LIBDIR="${LOCALBASE}/lib" HAVE_CUSE="YES" USE_RC_SUBR= webcamd SUB_FILES= webcamd.conf -OPTIONS_DEFINE= COMPAT32 DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM +OPTIONS_DEFINE= DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM OPTIONS_DEFAULT=DVB HAL INPUT RADIO WEBCAM COMPAT32_DESC= Enable 32-bit compatibility support COMPAT32_MAKE_ARGS= HAVE_COMPAT32="YES" -.include - -.if ${ARCH} == amd64 || ${ARCH} == aarch64 -OPTIONS_DEFAULT+= COMPAT32 -.endif +# +# 32-bit compatibility support is mostly useful for +# platforms using 32-bit applications: +# +OPTIONS_DEFINE_amd64= COMPAT32 +OPTIONS_DEFINE_aarch64= COMPAT32 +OPTIONS_DEFAULT_amd64= COMPAT32 +OPTIONS_DEFAULT_aarch64= COMPAT32 HAL_DESC= Build with HAL and DBUS support HAL_LIB_DEPENDS+= libhal.so:sysutils/hal