Changeset 98983

Timestamp:

Oct 22, 2012, 10:23:57 PM (12 years ago)

Author:

ryandesign@…

Message:

glib2-devel: merge r93246 from glib2: BSD readlink doesn't accept -f flag; see ​https://bugzilla.gnome.org/show_bug.cgi?id=640834

File:

• trunk/dports/devel/glib2-devel/files/patch-configure.diff (modified) (3 diffs)

trunk/dports/devel/glib2-devel/files/patch-configure.diff

@@ -1 +1 @@
 --- 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=''
@@ -24 +33 @@
 +${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)
@@ -30 +41 @@
 +${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))