cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define variables with C linkage to match earlier declarations.

Browse Source 
This fixes clang6 errors that "declaration in global scope conflicts
with declaration with C language linkage".  None of these show up
on x86, but some do on aarch64 due to different #ifdef paths.
ok pirofti@
This commit is contained in:
naddy 2018-04-28 10:16:25 +00:00
parent 7e799dfc72
commit e69cb49521
4 changed files with 82 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/cln/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.24 2017/07/26 22:45:17 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2018/04/28 10:16:25 naddy Exp $
NOT_FOR_ARCHS = arm mips64 mips64el sparc64 hppa
COMMENT = library for efficient computations
DISTNAME = cln-1.3.4
REVISION = 1
REVISION = 2
SHARED_LIBS += cln 3.0 # .6.4
CATEGORIES = devel

9
devel/cln/patches/patch-Makefile_in
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.1 2009/10/22 10:40:33 pirofti Exp $
--- Makefile.in.orig Thu Oct 22 13:16:23 2009
+++ Makefile.in Thu Oct 22 13:16:33 2009
@@ -279,8 +279,8 @@ target_alias = @target_alias@
$OpenBSD: patch-Makefile_in,v 1.2 2018/04/28 10:16:25 naddy Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -385,8 +385,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

42
devel/cln/patches/patch-src_base_low_cl_low_div_cc Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-src_base_low_cl_low_div_cc,v 1.1 2018/04/28 10:16:25 naddy Exp $
Index: src/base/low/cl_low_div.cc
--- src/base/low/cl_low_div.cc.orig
+++ src/base/low/cl_low_div.cc
@@ -10,11 +10,11 @@
// Implementation.
#ifdef NEED_VAR_divu_16_rest
-uint16 divu_16_rest;
+extern "C" { uint16 divu_16_rest; }
#endif
#ifdef NEED_FUNCTION_divu_3216_1616_
-uint16 divu_16_rest;
+extern "C" { uint16 divu_16_rest; }
namespace cln {
#if 1
// Most processors have a good 32 by 32 bit division, use that.
@@ -101,11 +101,11 @@ uint32 divu_3232_3232_(uint32 x, uint32 y)
#endif
#ifdef NEED_VAR_divu_32_rest
-uint32 divu_32_rest;
+extern "C" { uint32 divu_32_rest; }
#endif
#ifdef NEED_FUNCTION_divu_6432_3232_
-uint32 divu_32_rest;
+extern "C" { uint32 divu_32_rest; }
namespace cln {
uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 y)
// Methode:
@@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32
#endif
#ifdef NEED_VAR_divu_64_rest
-uint64 divu_64_rest;
+extern "C" { uint64 divu_64_rest; }
#endif
#ifdef NEED_FUNCTION_divu_6464_6464_

33
devel/cln/patches/patch-src_base_low_cl_low_mul_cc Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_base_low_cl_low_mul_cc,v 1.1 2018/04/28 10:16:25 naddy Exp $
Index: src/base/low/cl_low_mul.cc
--- src/base/low/cl_low_mul.cc.orig
+++ src/base/low/cl_low_mul.cc
@@ -10,11 +10,11 @@
// Implementation.
#ifdef NEED_VAR_mulu32_high
-uint32 mulu32_high;
+extern "C" { uint32 mulu32_high; }
#endif
#ifdef NEED_FUNCTION_mulu32_
-uint32 mulu32_high;
+extern "C" { uint32 mulu32_high; }
namespace cln {
uint32 mulu32_ (uint32 x, uint32 y)
{
@@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2)
#ifdef NEED_VAR_mulu64_high
-uint64 mulu64_high;
+extern "C" { uint64 mulu64_high; }
#endif
#ifdef NEED_FUNCTION_mulu64_
-uint64 mulu64_high;
+extern "C" { uint64 mulu64_high; }
namespace cln {
extern "C" uint64 mulu64_ (uint64 x, uint64 y);
uint64 mulu64_ (uint64 x, uint64 y)