pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/libgcrypt fix socklen_t hack by falling throu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5004269f3027
branches:  trunk
changeset: 486019:5004269f3027
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Dec 21 08:57:48 2004 +0000

description:
fix socklen_t hack by falling through to ${TRUE} if ${GREP} fails
(pattern not matched). ugh, bash.

fixes build on Linux. reported by minskim@

diffstat:

 security/libgcrypt/hacks.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 4cf9a2898faa -r 5004269f3027 security/libgcrypt/hacks.mk
--- a/security/libgcrypt/hacks.mk       Tue Dec 21 07:01:07 2004 +0000
+++ b/security/libgcrypt/hacks.mk       Tue Dec 21 08:57:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2004/12/18 23:54:58 grant Exp $
+# $NetBSD: hacks.mk,v 1.2 2004/12/21 08:57:48 grant Exp $
 
 # config.h #defines socklen_t if it is not defined, but libgcrypt does
 # not propogate this to the installed gcrypt.h, so packages using it
@@ -6,7 +6,7 @@
 #
 # hack around this by using the same #define (if present) in gcrypt.h.
 post-configure:
-       socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h`; \
+       socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h || ${TRUE}`; \
                ${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



Home | Main Index | Thread Index | Old Index