[30717] trunk/dports/devel/glib2

[source_changes at macosforge.org]

Revision: 30717
          http://trac.macosforge.org/projects/macports/changeset/30717
Author:   ryandesign at macports.org
Date:     2007-11-05 09:08:21 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
glib2: new attempt to try to fix the 'duplicate symbol _g_bit_nth_lsf' problem on Mac OS X 10.5 Leopard; see #13006

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile
    trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2007-11-05 16:08:38 UTC (rev 30716)
+++ trunk/dports/devel/glib2/Portfile	2007-11-05 17:08:21 UTC (rev 30717)
@@ -5,7 +5,7 @@
 name                glib2
 set my_name         glib
 version             2.14.2
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 maintainers         ryandesign
@@ -77,7 +77,6 @@
 
 platform darwin 9 {
 	patchfiles-append patch-glib_gutils.h.diff
-	configure.cflags-append -finline-functions
 }
 
 livecheck.check     regex

Modified: trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff	2007-11-05 16:08:38 UTC (rev 30716)
+++ trunk/dports/devel/glib2/files/patch-glib_gutils.h.diff	2007-11-05 17:08:21 UTC (rev 30717)
@@ -4,8 +4,8 @@
  #ifdef G_IMPLEMENT_INLINES
  #  define G_INLINE_FUNC
  #  undef  G_CAN_INLINE
-+#elif defined (__APPLE__) && !defined(GLIB_COMPILATION) && !defined(GOBJECT_COMPILATION)
-+#  define G_INLINE_FUNC inline
++#elif defined (__APPLE__)
++#  define G_INLINE_FUNC static inline
  #elif defined (__GNUC__) 
  #  define G_INLINE_FUNC extern inline
  #elif defined (G_CAN_INLINE) 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071105/184c69b0/attachment.html