Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Sep 2020 02:36:31 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547311 - head/emulators/joytran
Message-ID:  <202009020236.0822aVkf022651@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Sep  2 02:36:31 2020
New Revision: 547311
URL: https://svnweb.freebsd.org/changeset/ports/547311

Log:
  - Add -fcommon to CFLAGS to unbreak the build against modern compilers,
    e.g. Clang 11 or GCC 10
  - While here, fix CMAKE_ARGS to avoid multi-page complaints from CMake
    and replace USE* knobs in somewhat more logical order
  
  Reported by:	pkg-fallout

Modified:
  head/emulators/joytran/Makefile

Modified: head/emulators/joytran/Makefile
==============================================================================
--- head/emulators/joytran/Makefile	Wed Sep  2 02:10:03 2020	(r547310)
+++ head/emulators/joytran/Makefile	Wed Sep  2 02:36:31 2020	(r547311)
@@ -13,12 +13,16 @@ COMMENT=	Joystick to keyboard/mouse events translator 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USE_SDL=	sdl2
 USES=		cmake:insource pkgconfig sdl tar:bzip2 xorg
-CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" -DPREFIX="${PREFIX}"
+USE_SDL=	sdl2
 USE_XORG=	x11 xtst
+CMAKE_ARGS=	-DLOCALBASE:PATH="${LOCALBASE}"
 
 OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e '/WARNING_FLAGS/s,-pedantic,& -fcommon,' \
+		${WRKSRC}/CMakeLists.txt
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}



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