[111575] trunk/dports/devel

[ryandesign at macports.org]

Revision: 111575
          https://trac.macports.org/changeset/111575
Author:   ryandesign at macports.org
Date:     2013-09-26 05:09:55 -0700 (Thu, 26 Sep 2013)
Log Message:
-----------
glib2, glib2-devel: patch gmacros.h to disable the possibility of using the clang static analyzer, since this causes clang < 3.1 to fail to build glib2 or any ports using gmessages.h (#40590)

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile
    trunk/dports/devel/glib2-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/glib2/files/patch-glib_gmacros.h.diff
    trunk/dports/devel/glib2-devel/files/patch-glib_gmacros.h.diff

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2013-09-26 12:02:45 UTC (rev 111574)
+++ trunk/dports/devel/glib2/Portfile	2013-09-26 12:09:55 UTC (rev 111575)
@@ -11,6 +11,7 @@
 conflicts                   glib2-devel
 set my_name                 glib
 version                     2.38.0
+revision                    1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -38,6 +39,7 @@
 # See https://trac.macports.org/changeset/27148
 patchfiles                  patch-configure.diff \
                             patch-glib-2.0.pc.in.diff \
+                            patch-glib_gmacros.h.diff \
                             patch-glib_gunicollate.c.diff \
                             patch-gi18n.h.diff \
                             patch-gio_xdgmime_xdgmime.c.diff \
@@ -55,10 +57,6 @@
 # GLib-CRITICAL **: attempting to free a locked GVariant instance.  This should never happen.
 compiler.blacklist-append   {clang < 318}
 
-# error: expected ';' after top level declarator
-# https://bugzilla.gnome.org/show_bug.cgi?id=708793
-compiler.blacklist-append   {clang < 421} macports-clang-2.9 macports-clang-3.0
-
 # https://bugzilla.gnome.org/show_bug.cgi?id=697017
 compiler.blacklist-append   gcc-3.3 gcc-4.0 apple-gcc-4.0
 

Added: trunk/dports/devel/glib2/files/patch-glib_gmacros.h.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib_gmacros.h.diff	                        (rev 0)
+++ trunk/dports/devel/glib2/files/patch-glib_gmacros.h.diff	2013-09-26 12:09:55 UTC (rev 111575)
@@ -0,0 +1,17 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=708793
+--- glib/gmacros.h.orig	2013-09-26 06:52:01.000000000 -0500
++++ glib/gmacros.h	2013-09-26 06:52:22.000000000 -0500
+@@ -163,13 +163,8 @@
+ #define __has_feature(x) 0
+ #endif
+ 
+-#if __has_feature(attribute_analyzer_noreturn)
+-#define G_ANALYZER_ANALYZING 1
+-#define G_ANALYZER_NORETURN __attribute__((analyzer_noreturn))
+-#else
+ #define G_ANALYZER_ANALYZING 0
+ #define G_ANALYZER_NORETURN
+-#endif
+ 
+ #define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
+ #define	G_STRINGIFY_ARG(contents)	#contents

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2013-09-26 12:02:45 UTC (rev 111574)
+++ trunk/dports/devel/glib2-devel/Portfile	2013-09-26 12:09:55 UTC (rev 111575)
@@ -11,6 +11,7 @@
 conflicts                   glib2
 set my_name                 glib
 version                     2.38.0
+revision                    1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -38,6 +39,7 @@
 # See https://trac.macports.org/changeset/27148
 patchfiles                  patch-configure.diff \
                             patch-glib-2.0.pc.in.diff \
+                            patch-glib_gmacros.h.diff \
                             patch-glib_gunicollate.c.diff \
                             patch-gi18n.h.diff \
                             patch-gio_xdgmime_xdgmime.c.diff \
@@ -55,10 +57,6 @@
 # GLib-CRITICAL **: attempting to free a locked GVariant instance.  This should never happen.
 compiler.blacklist-append   {clang < 318}
 
-# error: expected ';' after top level declarator
-# https://bugzilla.gnome.org/show_bug.cgi?id=708793
-compiler.blacklist-append   {clang < 421} macports-clang-2.9 macports-clang-3.0
-
 # https://bugzilla.gnome.org/show_bug.cgi?id=697017
 compiler.blacklist-append   gcc-3.3 gcc-4.0 apple-gcc-4.0
 

Added: trunk/dports/devel/glib2-devel/files/patch-glib_gmacros.h.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib_gmacros.h.diff	                        (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-glib_gmacros.h.diff	2013-09-26 12:09:55 UTC (rev 111575)
@@ -0,0 +1,17 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=708793
+--- glib/gmacros.h.orig	2013-09-26 06:52:01.000000000 -0500
++++ glib/gmacros.h	2013-09-26 06:52:22.000000000 -0500
+@@ -163,13 +163,8 @@
+ #define __has_feature(x) 0
+ #endif
+ 
+-#if __has_feature(attribute_analyzer_noreturn)
+-#define G_ANALYZER_ANALYZING 1
+-#define G_ANALYZER_NORETURN __attribute__((analyzer_noreturn))
+-#else
+ #define G_ANALYZER_ANALYZING 0
+ #define G_ANALYZER_NORETURN
+-#endif
+ 
+ #define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
+ #define	G_STRINGIFY_ARG(contents)	#contents
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130926/510abf8c/attachment.html>