svn commit: r382648 - in head/devel/hs-gtk2hs-buildtools: . files

[John Marino]

Author: marino
Date: Mon Mar 30 10:43:04 2015
New Revision: 382648
URL: https://svnweb.freebsd.org/changeset/ports/382648
QAT: https://qat.redports.org/buildarchive/r382648/

Log:
  devel/hs-gtk2hs-buildtools: Fix build of www/hs-gtk with gcc5
  
  The Haskell gtk buildtools use CPP.  The CPP on gcc5 has changed
  behavior, thus preventing hs-gtk from successfully building with gcc5.
  By adding the -P argument when invoking "cpp" which forces the old
  behavior, hs-gtk can be built by all versions of gcc.
  
  PR:		197924
  Submitted by:	marino
  Approved by:	haskell@ (pgj@)

Added:
  head/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs   (contents, props changed)
Modified:
  head/devel/hs-gtk2hs-buildtools/Makefile

Modified: head/devel/hs-gtk2hs-buildtools/Makefile
==============================================================================
--- head/devel/hs-gtk2hs-buildtools/Makefile	Mon Mar 30 09:38:46 2015	(r382647)
+++ head/devel/hs-gtk2hs-buildtools/Makefile	Mon Mar 30 10:43:04 2015	(r382648)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gtk2hs-buildtools
 PORTVERSION=	0.12.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell at FreeBSD.org

Added: head/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs	Mon Mar 30 10:43:04 2015	(r382648)
@@ -0,0 +1,11 @@
+--- c2hs/toplevel/C2HSConfig.hs.orig	2014-04-13 05:14:06 UTC
++++ c2hs/toplevel/C2HSConfig.hs
+@@ -70,7 +70,7 @@ cpp  = case os of
+ cppopts :: [String]
+ cppopts  = case (os,cpp) of
+   ("openbsd","cpp") -> ["-xc", "-w"]
+-  (_,"cpp")         -> ["-x", "c", "-w"]
++  (_,"cpp")         -> ["-x", "c", "-P", "-w"]
+   (_,"gcc")         -> ["-E", "-x", "c", "-w"]
+   _                 -> []
+