pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/openssl Fix builtin detection for latest vers...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/685218c7b587
branches:  trunk
changeset: 648970:685218c7b587
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Thu Mar 26 08:05:02 2015 +0000

description:
Fix builtin detection for latest version (introduced a space between
'#' and 'define') - avoids unconditionally building pkgsrc openssl
on netbsd-current.

ok'd for during the freeze after an excessively long discussion :-/

diffstat:

 security/openssl/builtin.mk |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r b670c735e595 -r 685218c7b587 security/openssl/builtin.mk
--- a/security/openssl/builtin.mk       Thu Mar 26 07:54:51 2015 +0000
+++ b/security/openssl/builtin.mk       Thu Mar 26 08:05:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.42 2014/06/05 12:16:06 wiz Exp $
+# $NetBSD: builtin.mk,v 1.43 2015/03/26 08:05:02 dholland Exp $
 
 BUILTIN_PKG:=  openssl
 
@@ -32,6 +32,7 @@
        ${AWK} 'BEGIN { hex="0123456789abcdef";                         \
                        alpha="abcdefghijklmnopqrstuvwxyz";     \
                }                                                       \
+               /\#[    ]+define/ { sub("\#[ \\t]+define", "\#define", $$0); } \
                /\#define[      ]*OPENSSL_VERSION_NUMBER/ {             \
                        major = index(hex, substr($$3, 3, 1)) - 1;      \
                        i = 16 * (index(hex, substr($$3, 4, 1)) - 1);   \



Home | Main Index | Thread Index | Old Index