Re: pkg/38197 (libgcrypt 1.4.0 doesn't build on NetBSD 3.1 x386)

[Matthias Scheler <tron%NetBSD.org@localhost>]

The following reply was made to PR pkg/38197; it has been noted by GNATS.

From: Matthias Scheler <tron%NetBSD.org@localhost>
To: NetBSD GNATS <gnats-bugs%NetBSD.org@localhost>
Cc: 
Subject: Re: pkg/38197 (libgcrypt 1.4.0 doesn't build on NetBSD 3.1 x386)
Date: Tue, 25 Mar 2008 21:50:10 +0000

 On Tue, Mar 25, 2008 at 09:46:29PM +0000, tron%NetBSD.org@localhost wrote:
 > Synopsis: libgcrypt 1.4.0 doesn't build on NetBSD 3.1 x386
 > 
 > Responsible-Changed-From-To: pkg-manager->tron
 > Responsible-Changed-By: tron%NetBSD.org@localhost
 > Responsible-Changed-When: Tue, 25 Mar 2008 21:46:28 +0000
 > Responsible-Changed-Why:
 > I'll handle this PR.
 > 
 > 
 > State-Changed-From-To: closed->open
 > State-Changed-By: tron%NetBSD.org@localhost
 > State-Changed-When: Tue, 25 Mar 2008 21:46:28 +0000
 > State-Changed-Why:
 > The problem was apparently not fixed yet.
 
 The following patch should fix the problem.
 
        Kind regards
 
 -- 
 Matthias Scheler                                  http://zhadum.org.uk/
 
 Index: hacks.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/libgcrypt/hacks.mk,v
 retrieving revision 1.3
 diff -u -r1.3 hacks.mk
 --- hacks.mk   16 Mar 2008 20:14:38 -0000      1.3
 +++ hacks.mk   25 Mar 2008 21:47:55 -0000
 @@ -10,10 +10,3 @@
                ${MV} ${WRKSRC}/src/gcrypt.h ${WRKSRC}/src/gcrypt.h.old; \
                ${SED} -e "s,^/\* socklen_t \*/,$$socklen," \
                        ${WRKSRC}/src/gcrypt.h.old > ${WRKSRC}/src/gcrypt.h
 -
 -# GCC 3.x (at least 3.3.3 on NetBSD) fails to compile asm() call in
 -# cipher/rijndael.c:do_padlock()
 -.include "../../mk/compiler.mk"
 -.if !empty(CC_VERSION:Mgcc-3.*)
 -CFLAGS+=       -fomit-frame-pointer
 -.endif
 Index: options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/libgcrypt/options.mk,v
 retrieving revision 1.1
 diff -u -r1.1 options.mk
 --- options.mk 29 Aug 2007 23:11:38 -0000      1.1
 +++ options.mk 25 Mar 2008 21:47:55 -0000
 @@ -3,6 +3,18 @@
  PKG_OPTIONS_VAR=      PKG_OPTIONS.libgcrypt
  PKG_SUPPORTED_OPTIONS=        idea
  
 +.include "../../mk/bsd.prefs.mk"
 +
 +.if ${MACHINE_ARCH} == "i386"
 +.  include "../../mk/compiler.mk"
 +# GCC 3.x (at least 3.3.3 on NetBSD) fails to compile asm() call in
 +# cipher/rijndael.c:do_padlock()
 +.  if empty(CC_VERSION:Mgcc-3.*)
 +PKG_SUPPORTED_OPTIONS+=       padlock
 +PKG_SUGGESTED_OPTIONS+=       padlock
 +.  endif
 +.endif
 +
  .include "../../mk/bsd.options.mk"
  
  .if !empty(PKG_OPTIONS:Midea)
 @@ -26,3 +38,9 @@
  pre-configure:
        cd ${WRKSRC} && autoreconf -i -v
  .endif
 +
 +.if empty(PKG_OPTIONS:Mpadlock)
 +# disable padlock
 +CONFIGURE_ARGS+=        --disable-padlock-support
 +.endif
 +