diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-04-08 03:57:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-08 03:57:59 +0000 |
| commit | 569bed6df2950c7395239ac1c253fbe8e1f1c97b (patch) | |
| tree | 93caea3015b4135172038eda6a8321b1b5a3102e /media-libs/libjsw/files | |
| parent | add ibm use flag (diff) | |
| download | gentoo-2-569bed6df2950c7395239ac1c253fbe8e1f1c97b.tar.gz gentoo-2-569bed6df2950c7395239ac1c253fbe8e1f1c97b.tar.bz2 gentoo-2-569bed6df2950c7395239ac1c253fbe8e1f1c97b.zip | |
Add a patch to work around a gcc-3.3 bug #85780.
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-libs/libjsw/files')
| -rw-r--r-- | media-libs/libjsw/files/digest-libjsw-1.5.4 | 1 | ||||
| -rw-r--r-- | media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch | 31 |
2 files changed, 31 insertions, 1 deletions
diff --git a/media-libs/libjsw/files/digest-libjsw-1.5.4 b/media-libs/libjsw/files/digest-libjsw-1.5.4 deleted file mode 100644 index a8bd9c2505b8..000000000000 --- a/media-libs/libjsw/files/digest-libjsw-1.5.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 2728c790bdebd592370725bb362c12a6 libjsw-1.5.4.tar.bz2 310385 diff --git a/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch b/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch new file mode 100644 index 000000000000..95a4e3e312c1 --- /dev/null +++ b/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch @@ -0,0 +1,31 @@ +Work around a gcc-3.3.x bug where redefining prototypes with different +__THROW / attribute(nonnull) markings throws an error: + +string.cpp:31: error: declaration of `char* strcasestr(const char*, const char*)' throws different exceptions +../include/string.h:46: error: than previous declaration `char* strcasestr(const char*, const char*) throw ()' + +basically we just use the glibc strcasestr() instead of the internal one. + +http://bugs.gentoo.org/show_bug.cgi?id=85780 + +--- libjsw/string.cpp ++++ libjsw/string.cpp +@@ -28,3 +28,5 @@ + #endif ++#ifndef _GNU_SOURCE + char *strcasestr(const char *haystack, const char *needle); ++#endif + int strpfx(const char *s, const char *pfx); +@@ -217,3 +219,4 @@ + */ ++#ifndef _GNU_SOURCE + char *strcasestr(const char *haystack, const char *needle) + { +@@ -274,6 +277,7 @@ + + return(NULL); + } ++#endif + + /* + * Checks if string pfx is a prefix of string s. |