summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2021-08-16 01:47:24 +0000
committerdholland <dholland@pkgsrc.org>2021-08-16 01:47:24 +0000
commitb9eac67b936c65f852811b7b468d3c65047364bd (patch)
tree0ef1bff3d63708112a3fdbc0268c740219242cc4 /lang
parentaef9c48d6df0d44bcf75f8b545f47a5ecbd10d07 (diff)
downloadpkgsrc-b9eac67b936c65f852811b7b468d3c65047364bd.tar.gz
lang/oo2c: avoid build failure with ssp enabled.
(still doesn't build for me after that; there's something wrong with the docs processing)
Diffstat (limited to 'lang')
-rw-r--r--lang/oo2c/Makefile3
-rw-r--r--lang/oo2c/distinfo3
-rw-r--r--lang/oo2c/patches/patch-lib_src____libc.h16
3 files changed, 20 insertions, 2 deletions
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index d46922d6228..de329ba6d38 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2021/05/24 19:52:34 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2021/08/16 01:47:24 dholland Exp $
DISTNAME= oo2c_${BITS}-2.0.11
PKGNAME= oo2c-2.0.11
@@ -17,6 +17,7 @@ DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run
USE_LIBTOOL= yes
+NOT_FOR_COMPILER= clang # uses nested functions extensively
TEST_TARGET= test
diff --git a/lang/oo2c/distinfo b/lang/oo2c/distinfo
index 67710ffe8b6..0166227c3ad 100644
--- a/lang/oo2c/distinfo
+++ b/lang/oo2c/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2020/05/14 03:02:31 gutteridge Exp $
+$NetBSD: distinfo,v 1.14 2021/08/16 01:47:24 dholland Exp $
SHA1 (oo2c_32-2.0.11.tar.bz2) = b8962b7fdf9505dc1769602ade44d8e56eda8d45
RMD160 (oo2c_32-2.0.11.tar.bz2) = c51dc82ec09c9d2f82cb1f10ee7814b3cce38502
@@ -14,3 +14,4 @@ SHA1 (patch-ab) = 246c0edabfefac3406dbce46baee4ddd8c90f2fe
SHA1 (patch-ac) = d31a5920d189a0201f10fc0526330c903ae0abc5
SHA1 (patch-ad) = ff9564734be4774d1b57edfdc349c860f5063b55
SHA1 (patch-lib_src_Exception_c) = 5b758bd3df40d40b302b1a8eeac79a45b3c14b9b
+SHA1 (patch-lib_src____libc.h) = 7c4f3ce663b7a7ecf8f4e1fd5ffe575dc914e017
diff --git a/lang/oo2c/patches/patch-lib_src____libc.h b/lang/oo2c/patches/patch-lib_src____libc.h
new file mode 100644
index 00000000000..08117449a1d
--- /dev/null
+++ b/lang/oo2c/patches/patch-lib_src____libc.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_src____libc.h,v 1.1 2021/08/16 01:47:25 dholland Exp $
+
+Avoid parse errors when memcpy is already supplied as a macro.
+
+--- lib/src/__libc.h~ 2003-01-08 11:44:57.000000000 +0000
++++ lib/src/__libc.h
+@@ -21,6 +21,9 @@
+
+ extern double floor(double x);
+ extern long int lrint(double x);
++/* quick hack to avoid failing with ssp et al. */
++#ifndef memcpy
+ extern void* memcpy(void* dest, const void* src, __typeof__(sizeof(int)) n);
++#endif
+
+ #endif /* __oo2c_libc__ */