diff options
| author | ryoon <ryoon> | 2014-07-18 10:36:28 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2014-07-18 10:36:28 +0000 |
| commit | f82f334de4ccdb57ebf14717b5a56ea5654a7067 (patch) | |
| tree | 1e5be270bb2b2cc90abc04f0d91f00e575bdae59 /security/libgcrypt | |
| parent | 6141833d4a4415bd42c59ecad3e24f93abb37cc4 (diff) | |
| download | pkgsrc-f82f334de4ccdb57ebf14717b5a56ea5654a7067.tar.gz | |
Fix build under SCO OpenServer 5.0.7/3.2.
Diffstat (limited to 'security/libgcrypt')
| -rw-r--r-- | security/libgcrypt/Makefile | 9 | ||||
| -rw-r--r-- | security/libgcrypt/distinfo | 3 | ||||
| -rw-r--r-- | security/libgcrypt/patches/patch-src_visibility.h | 24 |
3 files changed, 34 insertions, 2 deletions
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index a15d080567d..af7819be6d3 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2014/02/03 16:51:35 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2014/07/18 10:36:28 ryoon Exp $ DISTNAME= libgcrypt-1.6.1 CATEGORIES= security @@ -31,6 +31,13 @@ CONFIGURE_ARGS+= --disable-asm .endif CONFIGURE_ARGS+= --disable-aesni-support +# SCO OpenServer 5.0.7/3.2 has no socklen_t, but it is defined in pthread.h +# from builtin GNU pth. +.if ${OS_VARIANT} == "SCOOSR5" +CONFIGURE_ENV+= ac_cv_type_socklen_t=yes +CONFIGURE_ENV+= gl_cv_socklen_t_equiv=int +.endif + .if !empty(PKGSRC_COMPILER:Mclang) CFLAGS+= -fheinous-gnu-extensions .endif diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo index 486d6b1d0db..d9e0e3e142a 100644 --- a/security/libgcrypt/distinfo +++ b/security/libgcrypt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.48 2014/04/01 09:48:37 obache Exp $ +$NetBSD: distinfo,v 1.49 2014/07/18 10:36:28 ryoon Exp $ SHA1 (libgcrypt-1.6.1.tar.bz2) = f03d9b63ac3b17a6972fc11150d136925b702f02 RMD160 (libgcrypt-1.6.1.tar.bz2) = df69424afa6fa27a1ad54b9ffae1d5bb4903f6b2 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 6fac21daa26b7de3b13839d076f78a74400efce7 SHA1 (patch-ad) = 19345b7d164521d526a44eb3f1a465ff09d8266c SHA1 (patch-configure) = c4e10bdb7e00a44d507f5b964f3e71a63828cd0a SHA1 (patch-mpi_config.links) = 3ada0ae5a68605ab6817dc611ceacf904e11c0d0 +SHA1 (patch-src_visibility.h) = 9b97ee91e8ea4e806ff8da3154a5982c6147d93a diff --git a/security/libgcrypt/patches/patch-src_visibility.h b/security/libgcrypt/patches/patch-src_visibility.h new file mode 100644 index 00000000000..8f55bea3ebe --- /dev/null +++ b/security/libgcrypt/patches/patch-src_visibility.h @@ -0,0 +1,24 @@ +$NetBSD: patch-src_visibility.h,v 1.1 2014/07/18 10:36:28 ryoon Exp $ + +--- src/visibility.h.orig 2014-01-29 09:48:38.000000000 +0000 ++++ src/visibility.h +@@ -26,7 +26,9 @@ + + /* Include the main header here so that public symbols are mapped to + the internal underscored ones. */ +-#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C ++/* All available GCC for SCO OpenServer 5.0.7/3.2 does not support ++ visibility. */ ++#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS) + /* We need to redeclare the deprecated functions without the + deprecated attribute. */ + # define GCRYPT_NO_DEPRECATED +@@ -48,7 +50,7 @@ gcry_err_code_t gcry_md_get (gcry_md_hd_ + NOTE: When adding new functions, please make sure to add them to + libgcrypt.vers and libgcrypt.def as well. */ + +-#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C ++#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS) + + /* A macro to flag a function as visible. */ + #ifdef GCRY_USE_VISIBILITY |