diff options
| author | joerg <joerg> | 2012-07-09 19:16:33 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-07-09 19:16:33 +0000 |
| commit | 603de15e7ddcc68ac29accacb6931413e9fbb120 (patch) | |
| tree | daae7d69148b7d8be78d54faf95a52c6c0bdbff0 | |
| parent | 692707af5a0f13dbb9873c4d5ad984f32a8eb6e4 (diff) | |
| download | pkgsrc-603de15e7ddcc68ac29accacb6931413e9fbb120.tar.gz | |
Don't use -std=gnu99 when compiling C++ code. Don't use restrict in C++
code either.
| -rw-r--r-- | devel/devIL/distinfo | 4 | ||||
| -rw-r--r-- | devel/devIL/patches/patch-include_IL_il.h | 13 | ||||
| -rw-r--r-- | devel/devIL/patches/patch-lib_Makefile.in | 13 |
3 files changed, 29 insertions, 1 deletions
diff --git a/devel/devIL/distinfo b/devel/devIL/distinfo index eb034befb44..93e442982f4 100644 --- a/devel/devIL/distinfo +++ b/devel/devIL/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2010/06/13 22:44:03 wiz Exp $ +$NetBSD: distinfo,v 1.8 2012/07/09 19:16:33 joerg Exp $ SHA1 (DevIL-1.7.8.tar.gz) = bc27e3e830ba666a3af03548789700d10561fcb1 RMD160 (DevIL-1.7.8.tar.gz) = a3cdb14fcca5e75ada240a53cbdc3e749a759da5 @@ -7,3 +7,5 @@ SHA1 (patch-aa) = 2784234ee79ada44f04219c5f49d5ea2c9e6bf4c SHA1 (patch-ab) = 995f402fa98cbfe96d43b98f6c409e484a53bf09 SHA1 (patch-ac) = b540afa8baca5bb5e71edc63291ce49eb2fafd23 SHA1 (patch-ad) = c8885607457c9af2d89dcf2d9e163fd224e0fa35 +SHA1 (patch-include_IL_il.h) = 553b2fbbd930ff6bab4b5bc790d13ebcccbfffba +SHA1 (patch-lib_Makefile.in) = a2ae8d1a97f2cbd9c46b2f5923be06839dd6c64f diff --git a/devel/devIL/patches/patch-include_IL_il.h b/devel/devIL/patches/patch-include_IL_il.h new file mode 100644 index 00000000000..e265db2fe43 --- /dev/null +++ b/devel/devIL/patches/patch-include_IL_il.h @@ -0,0 +1,13 @@ +$NetBSD: patch-include_IL_il.h,v 1.1 2012/07/09 19:16:33 joerg Exp $ + +--- include/IL/il.h.orig 2012-07-06 12:31:13.000000000 +0000 ++++ include/IL/il.h +@@ -63,7 +63,7 @@ extern "C" { + #endif + #endif + +-#ifdef RESTRICT_KEYWORD ++#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus) + #define RESTRICT restrict + #define CONST_RESTRICT const restrict + #else diff --git a/devel/devIL/patches/patch-lib_Makefile.in b/devel/devIL/patches/patch-lib_Makefile.in new file mode 100644 index 00000000000..07011a6852a --- /dev/null +++ b/devel/devIL/patches/patch-lib_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_Makefile.in,v 1.1 2012/07/09 19:16:33 joerg Exp $ + +--- lib/Makefile.in.orig 2012-07-06 12:25:06.000000000 +0000 ++++ lib/Makefile.in +@@ -352,7 +352,7 @@ AM_LDFLAGS = -version-info @DEVIL_LTVERS + AM_CFLAGS = $(GENERAL_CFLAGS) + libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include) + libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@ +-libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@ ++libIL_la_CXXFLAGS = @IL_CFLAGS@ + libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c \ + $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c \ + $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp \ |