Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2019 09:06:22 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518713 - head/graphics/glew-wayland
Message-ID:  <201911300906.xAU96MBc062216@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Nov 30 09:06:22 2019
New Revision: 518713
URL: https://svnweb.freebsd.org/changeset/ports/518713

Log:
  graphics/glew-wayland: unbreak on GCC architectures
  
  In file included from src/glew.c:43:
  include/GL/eglew.h:115: error: redefinition of typedef 'EGLint'
  /usr/local/include/EGL/eglplatform.h:158: error: previous declaration of 'EGLint' was here
  
  $ gcc42 -xc -c -
  typedef int foo;
  typedef int foo;
  ^D
  <stdin>:2: error: redefinition of typedef 'foo'
  <stdin>:1: error: previous declaration of 'foo' was here
  
  PR:		242310
  Reported by:	pkubaj

Modified:
  head/graphics/glew-wayland/Makefile   (contents, props changed)

Modified: head/graphics/glew-wayland/Makefile
==============================================================================
--- head/graphics/glew-wayland/Makefile	Sat Nov 30 09:03:54 2019	(r518712)
+++ head/graphics/glew-wayland/Makefile	Sat Nov 30 09:06:22 2019	(r518713)
@@ -22,5 +22,7 @@ slave-post-patch:
 	@${REINPLACE_CMD} 's/Makefile.$$(SYSTEM)/&-egl/' ${WRKSRC}/Makefile
 	@${SED} 's/linux/${OPSYS:tl}/' ${WRKSRC}/config/Makefile.linux-egl \
 		>${WRKSRC}/config/Makefile.${OPSYS:tl}-egl
+# GCC 4.2 doesn't support redefining same typedef
+	@${REINPLACE_CMD} '/typedef.*EGLint;/d' ${WRKSRC}/include/GL/eglew.h
 
 .include "${MASTERDIR}/Makefile"



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