[98983] trunk/dports/devel/glib2-devel/files/patch-configure.diff

[ryandesign at macports.org]

Revision: 98983
          http://trac.macports.org//changeset/98983
Author:   ryandesign at macports.org
Date:     2012-10-22 15:23:57 -0700 (Mon, 22 Oct 2012)
Log Message:
-----------
glib2-devel: merge r93246 from glib2: BSD readlink doesn't accept -f flag; see https://bugzilla.gnome.org/show_bug.cgi?id=640834

Revision Links:
--------------
    http://trac.macports.org//changeset/93246

Modified Paths:
--------------
    trunk/dports/devel/glib2-devel/files/patch-configure.diff

Modified: trunk/dports/devel/glib2-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.diff	2012-10-22 22:02:01 UTC (rev 98982)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff	2012-10-22 22:23:57 UTC (rev 98983)
@@ -1,5 +1,14 @@
 --- configure.orig	2012-09-17 16:50:13.000000000 -0500
-+++ configure	2012-09-18 16:14:27.000000000 -0500
++++ configure	2012-10-22 17:19:20.000000000 -0500
+@@ -5584,7 +5584,7 @@
+ fi
+ 
+ GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
+-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
++ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
+ 
+ 
+  if test "x$with_runtime_libdir" != "x"; then
 @@ -30644,10 +30644,10 @@
  *)			glib_vacopy=''
  esac
@@ -23,15 +32,15 @@
 +#ifdef __LP64__
 +${glib_extension}typedef signed long gint64;
 +${glib_extension}typedef unsigned long guint64;
-+
+ 
+-#define G_GINT64_CONSTANT(val)	$gint64_constant
+-#define G_GUINT64_CONSTANT(val)	$guint64_constant
 +#define G_GINT64_CONSTANT(val)	(val##L)
 +#define G_GUINT64_CONSTANT(val)	(val##UL)
 +#else
 +${glib_extension}typedef signed long long gint64;
 +${glib_extension}typedef unsigned long long guint64;
- 
--#define G_GINT64_CONSTANT(val)	$gint64_constant
--#define G_GUINT64_CONSTANT(val)	$guint64_constant
++
 +#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
 +#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
 +#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121022/14640267/attachment-0001.html>