<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[47055] trunk/dports/devel/glib2-devel</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/47055">47055</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2009-02-20 21:06:32 -0800 (Fri, 20 Feb 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>glib2-devel:
* update to 2.19.6
* fix universal issues by using muniversal portgroup; see #17042
* no longer use -funroll-loops; see #18384</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2develPortfile">trunk/dports/devel/glib2-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2develfilesconfigcache">trunk/dports/devel/glib2-devel/files/config.cache</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2develfilespatchconfigurediff">trunk/dports/devel/glib2-devel/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelglib2develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/glib2-devel/Portfile (47054 => 47055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2-devel/Portfile 2009-02-21 04:52:01 UTC (rev 47054)
+++ trunk/dports/devel/glib2-devel/Portfile 2009-02-21 05:06:32 UTC (rev 47055)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup muniversal 1.0
</ins><span class="cx">
</span><span class="cx"> name glib2-devel
</span><span class="cx"> set my_name glib
</span><del>-version 2.19.3
</del><ins>+version 2.19.6
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel
</span><span class="cx"> maintainers ryandesign
</span><span class="lines">@@ -28,9 +29,9 @@
</span><span class="cx"> # ftp://ftp.gtk.org/pub/${my_name}/${branch}/
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- md5 8c209e5ed7864cf38bd9f48db6631d1b \
- sha1 c67056bb797cd36ea23805ba93f301785cfc7807 \
- rmd160 f114c6a1901bed76d96392e6c2b609f181400895
</del><ins>+ md5 d78ebdcb6a9bbd7cce1f396501037f9b \
+ sha1 6b39ba2b1d702ada6da900410d2ef99191c5efe1 \
+ rmd160 47b58160f6ada1cfe75a723778400a8aee7f3c0b
</ins><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> patch-glib-2.0.pc.in.diff \
</span><span class="lines">@@ -51,7 +52,6 @@
</span><span class="cx"> -bind_at_load
</span><span class="cx">
</span><span class="cx"> configure.cflags-append \
</span><del>- -funroll-loops \
</del><span class="cx"> -fstrict-aliasing
</span><span class="cx">
</span><span class="cx"> configure.args \
</span><span class="lines">@@ -61,6 +61,36 @@
</span><span class="cx"> configure.perl ${prefix}/bin/perl
</span><span class="cx"> configure.env-append PERL_PATH=${configure.perl}
</span><span class="cx">
</span><ins>+set merger_dont_diff ${prefix}/lib/glib-2.0/include/glibconfig.h
+if {[variant_isset universal]} {
+ # Answers to questions configure can't determine without running a program.
+ configure.args-append --config-cache
+ # So it will find glib-genmarshal when cross-compiling.
+ if {"powerpc" == ${os.arch}} {
+ set build_arch ppc
+ } else {
+ set build_arch ${os.arch}
+ }
+ configure.env-append PATH=${workpath}/${build_arch}/gobject:$env(PATH)
+ build.env-append PATH=${workpath}/${build_arch}/gobject:$env(PATH)
+ pre-extract {
+ # ${workpath}/${build_arch}/gobject/glib-genmarshal must exist before a
+ # cross-compiled configure phase runs, so ${build_arch} must be configured
+ # first.
+ if {${build_arch} != [lindex ${universal_archs} 0]} {
+ ui_msg "When building a universal binary of ${name} on ${build_arch}, ${build_arch} must appear first in the list of universal_archs in ${prefix}/etc/macports/macports.conf"
+ return -code error "incompatible universal_archs order"
+ }
+ }
+ post-extract {
+ # Answers to questions configure can't determine without running a program.
+ copy ${filespath}/config.cache ${worksrcpath}
+ # So it will find glib-genmarshal during configure before it has been built.
+ touch ${worksrcpath}/gobject/glib-genmarshal
+ file attributes ${worksrcpath}/gobject/glib-genmarshal -permissions +x
+ }
+}
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
</span><span class="cx"> reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
</span><span class="lines">@@ -68,18 +98,9 @@
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx"> patchfiles-append \
</span><del>- patch-child-test.c.diff \
- patch-configure.diff
</del><ins>+ patch-child-test.c.diff
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-platform powerpc {
- if {[variant_isset universal]} {
- post-configure {
- reinplace {s|^#define G_ATOMIC_POWERPC 1$|#undef G_ATOMIC_POWERPC|} ${worksrcpath}/config.h
- }
- }
-}
-
</del><span class="cx"> test.run yes
</span><span class="cx"> test.target check
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelglib2develfilesconfigcache"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/glib2-devel/files/config.cache (0 => 47055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2-devel/files/config.cache (rev 0)
+++ trunk/dports/devel/glib2-devel/files/config.cache 2009-02-21 05:06:32 UTC (rev 47055)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+glib_cv_stack_grows=no
+glib_cv_uscore=no
+ac_cv_func_posix_getpwuid_r=yes
+ac_cv_func_posix_getgrgid_r=yes
</ins></span></pre></div>
<a id="trunkdportsdevelglib2develfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/glib2-devel/files/patch-configure.diff (47054 => 47055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2-devel/files/patch-configure.diff 2009-02-21 04:52:01 UTC (rev 47054)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff 2009-02-21 05:06:32 UTC (rev 47055)
</span><span class="lines">@@ -1,147 +0,0 @@
</span><del>---- configure.orig 2008-12-01 13:10:35.000000000 -0600
-+++ configure 2008-12-01 20:20:27.000000000 -0600
-@@ -28551,28 +28551,11 @@
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
- $as_echo "$ac_cv_c_bigendian" >&6; }
-- case $ac_cv_c_bigendian in #(
-- yes)
- cat >>confdefs.h <<\_ACEOF
-+#ifdef __BIG_ENDIAN__
- #define WORDS_BIGENDIAN 1
-+#endif
- _ACEOF
--;; #(
-- no)
-- ;; #(
-- universal)
--
--cat >>confdefs.h <<\_ACEOF
--#define AC_APPLE_UNIVERSAL_BUILD 1
--_ACEOF
--
-- ;; #(
-- *)
-- { { $as_echo "$as_me:$LINENO: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--$as_echo "$as_me: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-- { (exit 1); exit 1; }; } ;;
-- esac
-
- if test x$ac_cv_c_bigendian = xuniversal ; then
- cat >conftest.$ac_ext <<_ACEOF
-@@ -39672,7 +39655,11 @@
- $as_echo "$glib_cv_byte_contents_gmutex" >&6; }
-
- cat >>confdefs.h <<_ACEOF
--#define GLIB_BYTE_CONTENTS_GMUTEX $glib_cv_byte_contents_gmutex
-+#ifdef __BIG_ENDIAN__
-+#define GLIB_BYTE_CONTENTS_GMUTEX 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-+#else
-+#define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-+#endif
- _ACEOF
-
-
-@@ -46419,10 +46406,13 @@
- _______EOF
- fi
-
-- case x$g_stack_grows in
-- xyes) echo "#define G_HAVE_GROWING_STACK 1" >>$outfile ;;
-- *) echo "#define G_HAVE_GROWING_STACK 0" >>$outfile ;;
-- esac
-+ cat >>$outfile <<_______EOF
-+#ifdef __BIG_ENDIAN__
-+#define G_HAVE_GROWING_STACK 1
-+#else
-+#define G_HAVE_GROWING_STACK 0
-+#endif
-+_______EOF
-
-
- echo >>$outfile
-@@ -46471,7 +46461,12 @@
- long dummy_long;
- } static_mutex;
- };
--#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }
-+#ifdef __BIG_ENDIAN__
-+#define G_STATIC_MUTEX_INIT { NULL, { { 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#else
-+#define G_STATIC_MUTEX_INIT { NULL, { { -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-+#endif
-+
- #define g_static_mutex_get_mutex(mutex) \\
- (g_thread_use_default_impl ? ((GMutex*)(gpointer) ((mutex)->static_mutex.pad)) : \\
- g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-@@ -46500,24 +46495,39 @@
- void *dummy_pointer;
- long dummy_long;
- };
--_______EOF
-- if test x"$g_memory_barrier_needed" != xno; then
-- echo >>$outfile
-- echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
-- fi
-+#ifdef __BIG_ENDIAN__
-+#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1
-+#define GINT16_TO_BE(val) ((gint16) (val))
-+#define GUINT16_TO_BE(val) ((guint16) (val))
-+#define GINT16_TO_LE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
-+#define GUINT16_TO_LE(val) (GUINT16_SWAP_LE_BE (val))
-+#define GINT32_TO_BE(val) ((gint32) (val))
-+#define GUINT32_TO_BE(val) ((guint32) (val))
-+#define GINT32_TO_LE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
-+#define GUINT32_TO_LE(val) (GUINT32_SWAP_LE_BE (val))
-+#define GINT64_TO_BE(val) ((gint64) (val))
-+#define GUINT64_TO_BE(val) ((guint64) (val))
-+#define GINT64_TO_LE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
-+#define GUINT64_TO_LE(val) (GUINT64_SWAP_LE_BE (val))
-+
-+#else
-+
-+#define GINT16_TO_LE(val) ((gint16) (val))
-+#define GUINT16_TO_LE(val) ((guint16) (val))
-+#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
-+#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
-+#define GINT32_TO_LE(val) ((gint32) (val))
-+#define GUINT32_TO_LE(val) ((guint32) (val))
-+#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
-+#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
-+#define GINT64_TO_LE(val) ((gint64) (val))
-+#define GUINT64_TO_LE(val) ((guint64) (val))
-+#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
-+#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
-+
-+#endif
-
-- echo >>$outfile
-- g_bit_sizes="16 32 64"
-- for bits in $g_bit_sizes; do
-- cat >>$outfile <<_______EOF
--#define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
--#define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
--#define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
--#define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
--_______EOF
-- done
-
-- cat >>$outfile <<_______EOF
- #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
- #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
- #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
-@@ -46526,7 +46536,11 @@
- #define GUINT_TO_LE(val) ((guint) GUINT${gintbits}_TO_LE (val))
- #define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val))
- #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
--#define G_BYTE_ORDER $g_byte_order
-+#ifdef __BIG_ENDIAN__
-+#define G_BYTE_ORDER G_BIG_ENDIAN
-+#else
-+#define G_BYTE_ORDER G_LITTLE_ENDIAN
-+#endif
-
- #define GLIB_SYSDEF_POLLIN =$g_pollin
- #define GLIB_SYSDEF_POLLOUT =$g_pollout
</del></span></pre>
</div>
</div>
</body>
</html>