Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jun 2020 15:34:13 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r538099 - in head/comms: opencbm opencbm-plugin-xa1541
Message-ID:  <202006061534.056FYDWm079698@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Sat Jun  6 15:34:12 2020
New Revision: 538099
URL: https://svnweb.freebsd.org/changeset/ports/538099

Log:
  - fix CC, allow custom CFLAGS
  PR:		247033
  Submitted by:	Felix Palmen

Modified:
  head/comms/opencbm-plugin-xa1541/Makefile
  head/comms/opencbm/Makefile
  head/comms/opencbm/Makefile.inc

Modified: head/comms/opencbm-plugin-xa1541/Makefile
==============================================================================
--- head/comms/opencbm-plugin-xa1541/Makefile	Sat Jun  6 15:31:56 2020	(r538098)
+++ head/comms/opencbm-plugin-xa1541/Makefile	Sat Jun  6 15:34:12 2020	(r538099)
@@ -20,7 +20,7 @@ RUN_DEPENDS=	opencbm=${PORTVERSION}:comms/opencbm \
 USES=		gmake
 USE_LDCONFIG=	yes
 
-MAKE_ARGS=	CC=cc SUBDIRS_PLUGIN_XA1541=opencbm/lib/plugin/xa1541
+MAKE_ARGS=	CC="${CC}" SUBDIRS_PLUGIN_XA1541=opencbm/lib/plugin/xa1541
 MAKEFILE=	LINUX/Makefile
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	plugin-xa1541

Modified: head/comms/opencbm/Makefile
==============================================================================
--- head/comms/opencbm/Makefile	Sat Jun  6 15:31:56 2020	(r538098)
+++ head/comms/opencbm/Makefile	Sat Jun  6 15:34:12 2020	(r538099)
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=		DOCS INFO
 OPTIONS_DEFAULT=	DOCS INFO
 
-MAKE_ARGS=	CC=cc INFODIR=${PREFIX}/share/info
+MAKE_ARGS=	CC="${CC}" INFODIR=${PREFIX}/${INFO_PATH}
 MAKEFILE=	LINUX/Makefile
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	opencbm plugin-xu1541 plugin-xum1541

Modified: head/comms/opencbm/Makefile.inc
==============================================================================
--- head/comms/opencbm/Makefile.inc	Sat Jun  6 15:31:56 2020	(r538098)
+++ head/comms/opencbm/Makefile.inc	Sat Jun  6 15:34:12 2020	(r538099)
@@ -16,5 +16,7 @@ GH_PROJECT=	OpenCBM
 PATCHDIR=	${.CURDIR}/../opencbm/files
 PATCH_WRKSRC=	${WRKDIR}/OpenCBM-${OCBM_VERSION}
 
+MAKE_ENV=	USER_CFLAGS="${CFLAGS}"
+
 OCBM_LIBVERSION=	0.4.99.99
 PLUGINBASENAME=	${PREFIX}/lib/opencbm/plugin/libopencbm-



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