[104950] trunk/dports/devel/glib2/Portfile

[jeremyhu at macports.org]

Revision: 104950
          https://trac.macports.org/changeset/104950
Author:   jeremyhu at macports.org
Date:     2013-04-05 16:24:04 -0700 (Fri, 05 Apr 2013)
Log Message:
-----------
glib2: Don't use -Werror=missing-prototypes since it's broken on llvm-gcc42, also remove conflict with libelf by just using the configure option

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

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2013-04-05 23:10:42 UTC (rev 104949)
+++ trunk/dports/devel/glib2/Portfile	2013-04-05 23:24:04 UTC (rev 104950)
@@ -52,9 +52,6 @@
                             lib/libz.dylib \
                             lib/libffi.dylib
 
-# configure checks for libelf, and if found, the build fails; see #33948.
-conflicts_build             libelf
-
 # TODO: compiling with clang produces a glib that breaks other ports; see #32202, #32204, #32233.
 compiler.blacklist          clang
 
@@ -82,7 +79,7 @@
 
 configure.cflags-append     -fstrict-aliasing
 
-configure.args              --enable-static
+configure.args              --enable-static --disable-libelf
 
 configure.perl              ${prefix}/bin/perl
 configure.python            /usr/bin/python
@@ -91,20 +88,21 @@
                             ZLIB_CFLAGS="-I${prefix}/include" \
                             ZLIB_LIBS="-L${prefix}/lib -lz"
 
-pre-configure {
-    set libffi_version      [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
-    configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
-                            LIBFFI_LIBS="-L${prefix}/lib -lffi"
-}
-
 post-patch {
     reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
     reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/xdgmime/xdgmime.c
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/gdbusprivate.c
     reinplace "s|#! */usr/bin/env python|#!${configure.python}|g" ${worksrcpath}/glib/gtester-report
+    reinplace "s|-Werror=missing-prototypes||" ${worksrcpath}/configure
 }
 
+pre-configure {
+    set libffi_version      [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
+    configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
+                            LIBFFI_LIBS="-L${prefix}/lib -lffi"
+}
+
 post-configure {
     system "ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130405/994272bf/attachment.html>