diff options
author | markd <markd@pkgsrc.org> | 2006-07-08 21:14:14 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2006-07-08 21:14:14 +0000 |
commit | cd5170e5e877ff3306264e55c176bc463388092e (patch) | |
tree | 0356c1de5f5d29fcef7a9af8f4f8a2ca2e803c99 | |
parent | 7474582043846bd37559d6bf72bfa9856a1e533d (diff) | |
download | pkgsrc-cd5170e5e877ff3306264e55c176bc463388092e.tar.gz |
Don't try and do visibility stuff with gcc on Solaris as the Solaris
gcc/ld doesn't support it.
From Gilles Dauphin in PR pkg/33917
-rw-r--r-- | graphics/cairo/distinfo | 4 | ||||
-rw-r--r-- | graphics/cairo/patches/patch-ac | 22 | ||||
-rw-r--r-- | graphics/cairo/patches/patch-ad | 22 |
3 files changed, 47 insertions, 1 deletions
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 716f187bb61..0bb168f20e4 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.18 2006/07/04 15:14:49 drochner Exp $ +$NetBSD: distinfo,v 1.19 2006/07/08 21:14:14 markd Exp $ SHA1 (cairo-1.2.0.tar.gz) = c5da7f89cdd3782102357f99a47f516d11661e92 RMD160 (cairo-1.2.0.tar.gz) = 9dd76e43e881dfd3f20a81fc0f946e302ed7993c Size (cairo-1.2.0.tar.gz) = 2659930 bytes SHA1 (patch-aa) = 7d4b4fa8f685a64bbd703d2ee8ae5f6ad28d196d SHA1 (patch-ab) = d408881c714686a3481f66dcb069c763359313a6 +SHA1 (patch-ac) = de91ee6dd733c56957de83a1880a583eaf601126 +SHA1 (patch-ad) = 6778eecd56c622382ebd6c870193cd805aaf9d9c diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac new file mode 100644 index 00000000000..87300d9feae --- /dev/null +++ b/graphics/cairo/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2006/07/08 21:14:14 markd Exp $ + +--- src/cairoint.h.orig 2006-07-09 00:58:33.598209000 +1200 ++++ src/cairoint.h +@@ -67,7 +67,7 @@ + + CAIRO_BEGIN_DECLS + +-#if __GNUC__ >= 3 && defined(__ELF__) ++#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun__) + # define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name) + # define slim_hidden_def(name) slim_hidden_def1(name, INT_##name) + # define slim_hidden_proto1(name, internal) \ +@@ -95,7 +95,7 @@ CAIRO_BEGIN_DECLS + #endif + + /* slim_internal.h */ +-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) ++#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun__) + #define cairo_private __attribute__((__visibility__("hidden"))) + #else + #define cairo_private diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad new file mode 100644 index 00000000000..17fd4745c28 --- /dev/null +++ b/graphics/cairo/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2006/07/08 21:14:14 markd Exp $ + +--- pixman/src/slim_internal.h.orig 2006-07-09 01:01:35.889958000 +1200 ++++ pixman/src/slim_internal.h +@@ -47,7 +47,7 @@ + /* ??? Not marked with "slim" because that makes it look too much + like the function name instead of just an attribute. */ + +-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) ++#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun__) + #define pixman_private __attribute__((__visibility__("hidden"))) + #else + #define pixman_private +@@ -77,7 +77,7 @@ + the C symbol "EXT_foo", which is renamed to "foo" at the assembly + level. */ + +-#if __GNUC__ >= 3 && defined(__ELF__) ++#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun__) + # define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name) + # define slim_hidden_def(name) slim_hidden_def1(name, INT_##name) + # define slim_hidden_proto1(name, internal) \ |