Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Mar 2019 00:54:38 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r495679 - branches/2019Q1/games/openbor
Message-ID:  <201903140054.x2E0sc6d082223@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Mar 14 00:54:38 2019
New Revision: 495679
URL: https://svnweb.freebsd.org/changeset/ports/495679

Log:
  MFH: r494760 r495669
  
  games/openbor: unbreak with GCC 4.2
  
  cc1: error: unrecognized command line option "-Wno-unused-result"
  
  source/gamelib/loadimg.o:(.text+0x1ce8): undefined reference to `__builtin_unreachable'
  source/gamelib/loadimg.o:(.text+0x2164): undefined reference to `__builtin_unreachable'
  
  Reported by:	pkg-fallout
  Approved by:	ports-secteam blanket

Modified:
  branches/2019Q1/games/openbor/Makefile
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/games/openbor/Makefile
==============================================================================
--- branches/2019Q1/games/openbor/Makefile	Thu Mar 14 00:53:54 2019	(r495678)
+++ branches/2019Q1/games/openbor/Makefile	Thu Mar 14 00:54:38 2019	(r495679)
@@ -81,6 +81,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/ -O[0-9]//; s/ -g//; s/ -Werror//' \
 		-e 's/ -fomit-frame-pointer//' \
 		-e 's/ -freorder-blocks//' \
+		-e 's/ -Wno-unused-result//' \
 		-e 's/ -Wl,-rpath,$$(LIBRARIES)//' \
 		-e '/echo/!s/	@/	/' \
 		-e 's/@echo/@$$(ECHO)/' \
@@ -88,6 +89,8 @@ post-patch:
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's/\.openbor/.${PKGBASE}/' \
 		${WRKSRC}/sdl/sdlport.c
+	@${REINPLACE_CMD} -e 's/__builtin_unreachable/__unreachable/' \
+		${WRKSRC}/source/gamelib/loadimg.c
 	@${GREP} -Flr 'malloc.h' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		's,malloc\.h,stdlib.h,'
 	@${REINPLACE_CMD} -e 's/^function \(.*\) {/\1() {/' \



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