pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/oo2c lang/oo2c: avoid build failure with ssp enab...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c755edcc947
branches:  trunk
changeset: 457078:9c755edcc947
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Aug 16 01:47:24 2021 +0000

description:
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:

 lang/oo2c/Makefile                        |   3 ++-
 lang/oo2c/distinfo                        |   3 ++-
 lang/oo2c/patches/patch-lib_src____libc.h |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r f04a430b6117 -r 9c755edcc947 lang/oo2c/Makefile
--- a/lang/oo2c/Makefile        Mon Aug 16 01:29:37 2021 +0000
+++ b/lang/oo2c/Makefile        Mon Aug 16 01:47:24 2021 +0000
@@ -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 @@
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake perl:run
 USE_LIBTOOL=           yes
+NOT_FOR_COMPILER=      clang # uses nested functions extensively
 
 TEST_TARGET=           test
 
diff -r f04a430b6117 -r 9c755edcc947 lang/oo2c/distinfo
--- a/lang/oo2c/distinfo        Mon Aug 16 01:29:37 2021 +0000
+++ b/lang/oo2c/distinfo        Mon Aug 16 01:47:24 2021 +0000
@@ -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-ac) = d31a5920d189a0201f10fc0526330c903ae0abc5
 SHA1 (patch-ad) = ff9564734be4774d1b57edfdc349c860f5063b55
 SHA1 (patch-lib_src_Exception_c) = 5b758bd3df40d40b302b1a8eeac79a45b3c14b9b
+SHA1 (patch-lib_src____libc.h) = 7c4f3ce663b7a7ecf8f4e1fd5ffe575dc914e017
diff -r f04a430b6117 -r 9c755edcc947 lang/oo2c/patches/patch-lib_src____libc.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/oo2c/patches/patch-lib_src____libc.h Mon Aug 16 01:47:24 2021 +0000
@@ -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__ */



Home | Main Index | Thread Index | Old Index