From fcfa382ab33394c5468853ac213e37a06c62615a Mon Sep 17 00:00:00 2001 From: markd Date: Sat, 8 Jul 2006 21:07:04 +0000 Subject: 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/31545 --- graphics/libpixman/distinfo | 3 ++- graphics/libpixman/patches/patch-ab | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 graphics/libpixman/patches/patch-ab diff --git a/graphics/libpixman/distinfo b/graphics/libpixman/distinfo index 5538a5f2aaf..1c63c2e3e54 100644 --- a/graphics/libpixman/distinfo +++ b/graphics/libpixman/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.10 2005/11/04 17:56:38 tv Exp $ +$NetBSD: distinfo,v 1.11 2006/07/08 21:07:04 markd Exp $ SHA1 (libpixman-0.1.6.tar.gz) = cc596882ea8f41aada6e8d8e0e8ab2bf9303fb33 RMD160 (libpixman-0.1.6.tar.gz) = 28f00d5d1d31fa0647e7a02c880fd06bd0d77d80 Size (libpixman-0.1.6.tar.gz) = 387830 bytes SHA1 (patch-aa) = 8ac37437d9e53f0c37a9c25f9a61691187feba92 +SHA1 (patch-ab) = 9ac11c4792ce389d267a4c4d2ea957265d7fa051 diff --git a/graphics/libpixman/patches/patch-ab b/graphics/libpixman/patches/patch-ab new file mode 100644 index 00000000000..aff0e448e88 --- /dev/null +++ b/graphics/libpixman/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2006/07/08 21:07:04 markd Exp $ + +--- src/slim_internal.h.orig 2006-07-09 00:45:35.823806000 +1200 ++++ 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) \ -- cgit v1.2.3