Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 May 2020 12:20:39 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r534909 - head/multimedia/webcamd
Message-ID:  <202005111220.04BCKdwW092941@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005111220.04BCKdwW092941>