diff options
| author | dholland <dholland@pkgsrc.org> | 2015-12-25 02:55:16 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-12-25 02:55:16 +0000 |
| commit | 32e0c8c4dbabee85e33a8cb24fad3a5836354e57 (patch) | |
| tree | ed96879ba413b9412c4c17cc20e44ce23308ecc2 /net | |
| parent | 53aba10f3cdadad1a478c1b87f570740475ad1c8 (diff) | |
| download | pkgsrc-32e0c8c4dbabee85e33a8cb24fad3a5836354e57.tar.gz | |
Use "long" as "LONGLONG" only if native long long doesn't exist or
isn't 64 bits. Required to build omniNotify, which has C++ overloading
code that reasonably assumes that "long" and "LONGLONG" aren't the
same type.
Diffstat (limited to 'net')
| -rw-r--r-- | net/omniORB/Makefile | 3 | ||||
| -rw-r--r-- | net/omniORB/distinfo | 3 | ||||
| -rw-r--r-- | net/omniORB/patches/patch-include_omniORB4_CORBA__sysdep__auto.h | 33 |
3 files changed, 37 insertions, 2 deletions
diff --git a/net/omniORB/Makefile b/net/omniORB/Makefile index 8913109ff87..d3e4ca40d3b 100644 --- a/net/omniORB/Makefile +++ b/net/omniORB/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/12/05 21:25:52 adam Exp $ +# $NetBSD: Makefile,v 1.12 2015/12/25 02:55:16 dholland Exp $ DISTNAME= omniORB-4.1.7 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=omniorb/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/omniORB/distinfo b/net/omniORB/distinfo index 9efe909d66e..f4958fa9cf8 100644 --- a/net/omniORB/distinfo +++ b/net/omniORB/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 00:35:17 agc Exp $ +$NetBSD: distinfo,v 1.8 2015/12/25 02:55:16 dholland Exp $ SHA1 (omniORB-4.1.7.tar.bz2) = e039eba5f63458651cfdc8a67c664c1ce4134540 RMD160 (omniORB-4.1.7.tar.bz2) = fddd28888a8f735be0d47a487f4891325f8c3c6c @@ -9,3 +9,4 @@ SHA1 (patch-ab) = 4b20f8c5a4d34259d9a5810c7642a71822626c2c SHA1 (patch-ac) = 797e6fb2dba6b96a2f55008196f84c95101367ed SHA1 (patch-ad) = 8678d9e3aebafdd41cba62bb980e89c020feab80 SHA1 (patch-ae) = cdf99c4aa901c69fc4f22321d6616a7694264be8 +SHA1 (patch-include_omniORB4_CORBA__sysdep__auto.h) = 009aac236a345f21120b991d685e22e0022c6d58 diff --git a/net/omniORB/patches/patch-include_omniORB4_CORBA__sysdep__auto.h b/net/omniORB/patches/patch-include_omniORB4_CORBA__sysdep__auto.h new file mode 100644 index 00000000000..f9ac928dd39 --- /dev/null +++ b/net/omniORB/patches/patch-include_omniORB4_CORBA__sysdep__auto.h @@ -0,0 +1,33 @@ +$NetBSD: patch-include_omniORB4_CORBA__sysdep__auto.h,v 1.1 2015/12/25 02:55:16 dholland Exp $ + +Use "long" as "LONGLONG" only if native long long doesn't exist or isn't +64 bits. Fixes the build of omniNotify, which has code that reasonably +assumes that "long" and "LONGLONG" aren't the same type. + +--- include/omniORB4/CORBA_sysdep_auto.h~ 2010-11-22 23:00:44.000000000 +0000 ++++ include/omniORB4/CORBA_sysdep_auto.h +@@ -68,17 +68,17 @@ + + #define SIZEOF_PTR SIZEOF_VOIDP + +-#if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) +-# define HAS_LongLong +-# define _CORBA_LONGLONG_DECL long +-# define _CORBA_ULONGLONG_DECL unsigned long +-# define _CORBA_LONGLONG_CONST(x) (x) +- +-#elif defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8) ++#if defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8) + # define HAS_LongLong + # define _CORBA_LONGLONG_DECL long long + # define _CORBA_ULONGLONG_DECL unsigned long long + # define _CORBA_LONGLONG_CONST(x) (x##LL) ++ ++#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) ++# define HAS_LongLong ++# define _CORBA_LONGLONG_DECL long ++# define _CORBA_ULONGLONG_DECL unsigned long ++# define _CORBA_LONGLONG_CONST(x) (x) + #endif + + |