diff options
| author | shannonjr <shannonjr> | 2004-06-01 08:03:10 +0000 |
|---|---|---|
| committer | shannonjr <shannonjr> | 2004-06-01 08:03:10 +0000 |
| commit | cddc34e766e96a2c37c0f01b5efbf12d146b1364 (patch) | |
| tree | b9ccde46efd6a60ef80336113b72fa6dc266ec56 /devel/glib | |
| parent | 2b374e37d28dbe4de9cbb61cd71c30b048f1660b (diff) | |
| download | pkgsrc-cddc34e766e96a2c37c0f01b5efbf12d146b1364.tar.gz | |
Re: PR 25706 Syntax error prevents compilation with gcc 3.4.0
Applied patch provided by Christian Biere <christianbiere@gmx.de>
The patch ensures that G_GNUC_FUNCTION and G_GNUC_PRETTY_FUNCTION always
expand to string literals - necessary since they will be concatenated
(the source of the compilation error). This closes the PR.
Diffstat (limited to 'devel/glib')
| -rw-r--r-- | devel/glib/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib/patches/patch-aj | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/devel/glib/distinfo b/devel/glib/distinfo index 9a10845cefe..64e96ee976d 100644 --- a/devel/glib/distinfo +++ b/devel/glib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2004/04/12 20:18:07 jschauma Exp $ +$NetBSD: distinfo,v 1.12 2004/06/01 08:03:10 shannonjr Exp $ SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa Size (glib-1.2.10.tar.gz) = 421480 bytes @@ -10,3 +10,4 @@ SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59 SHA1 (patch-af) = 8fa1db64eb7a44e83e9e2ad483b12cf9fe50341e SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604 SHA1 (patch-ai) = 6f6e5727bcb52655865b689c923601843d8d453d +SHA1 (patch-aj) = ee05519f3b36e5b2a711ca01599ba1f0662faa20 diff --git a/devel/glib/patches/patch-aj b/devel/glib/patches/patch-aj new file mode 100644 index 00000000000..a072c5b2cf5 --- /dev/null +++ b/devel/glib/patches/patch-aj @@ -0,0 +1,26 @@ +$NetBSD: patch-aj,v 1.1 2004/06/01 08:03:10 shannonjr Exp $ + +--- glib.h.orig 2001-02-26 20:44:38.000000000 -0700 ++++ glib.h +@@ -271,14 +271,18 @@ extern "C" { + + /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with + * macros, so we can refer to them as strings unconditionally. ++ * ++ * NB: GLib requires that these expand to string literals so that ++ * they're concatenable. Therefore, they're only useful for GCC < 3.0 ++ * because since GCC 3.0 these macros expand to const pointers. + */ +-#ifdef __GNUC__ ++#if defined(__GNUC__) && (__GNUC__ < 3) + #define G_GNUC_FUNCTION __FUNCTION__ + #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ +-#else /* !__GNUC__ */ ++#else /* !(__GNUC__ < 3) */ + #define G_GNUC_FUNCTION "" + #define G_GNUC_PRETTY_FUNCTION "" +-#endif /* !__GNUC__ */ ++#endif /* !(__GNUC__ < 3) */ + + /* we try to provide a usefull equivalent for ATEXIT if it is + * not defined, but use is actually abandoned. people should |