diff options
author | taca <taca@pkgsrc.org> | 2017-04-23 14:49:27 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2017-04-23 14:49:27 +0000 |
commit | 45ae80000811ae06f1c7032e02b523cad9aac0b2 (patch) | |
tree | 881410373e977bd26cabcfd0c59bb8fdcf82361e | |
parent | 88b672da6d29e6eae38a6efe134c56d6d4e246e0 (diff) | |
download | pkgsrc-45ae80000811ae06f1c7032e02b523cad9aac0b2.tar.gz |
Fix build problem on NetBSD 6.1_STABLE.
* Guard use of rl_catch_signals variable with "#if HAVE_RL_CATCH_SIGNALS".
Add comment in patch/patch-aa quote from last commit message.
-rw-r--r-- | math/nickle/distinfo | 5 | ||||
-rw-r--r-- | math/nickle/patches/patch-aa | 4 | ||||
-rw-r--r-- | math/nickle/patches/patch-lex.c | 17 |
3 files changed, 23 insertions, 3 deletions
diff --git a/math/nickle/distinfo b/math/nickle/distinfo index bee18da356c..28442a760ad 100644 --- a/math/nickle/distinfo +++ b/math/nickle/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.10 2017/03/20 13:13:51 wiz Exp $ +$NetBSD: distinfo,v 1.11 2017/04/23 14:49:27 taca Exp $ SHA1 (nickle-2.79.tar.gz) = 86722b07df9eebf99789b91a0c576f14af8ea739 RMD160 (nickle-2.79.tar.gz) = a6a211cf1171960c0cab45c9d2206d5ae4abd374 SHA512 (nickle-2.79.tar.gz) = 3a98dc0e318a62e48b00cbc7bb1324be5c2461b29637ee77fe8ad3d788fdd32b7d896ca5e457edfd86f580901ffcb543d5f27442def271c267096aa9552f45f3 Size (nickle-2.79.tar.gz) = 581560 bytes -SHA1 (patch-aa) = 0b1e03f3e42ea088c5a81109e9534c77efe30659 +SHA1 (patch-aa) = 4cbb563244883f6c9f7a3594875052f8d9a9e9b3 +SHA1 (patch-lex.c) = f9d5f3f282f97a94195730062525e9f6310bb316 diff --git a/math/nickle/patches/patch-aa b/math/nickle/patches/patch-aa index e86449ed566..b0fae23a75d 100644 --- a/math/nickle/patches/patch-aa +++ b/math/nickle/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2010/01/15 23:09:28 tnn Exp $ +$NetBSD: patch-aa,v 1.5 2017/04/23 14:49:27 taca Exp $ + +* Fix build issue with Sun Studio. --- execute.c.orig 2008-03-20 00:21:49.000000000 +0000 +++ execute.c diff --git a/math/nickle/patches/patch-lex.c b/math/nickle/patches/patch-lex.c new file mode 100644 index 00000000000..124f940a6d9 --- /dev/null +++ b/math/nickle/patches/patch-lex.c @@ -0,0 +1,17 @@ +$NetBSD: patch-lex.c,v 1.1 2017/04/23 14:49:27 taca Exp $ + +Assign rl_catch_signals only if HAVE_RL_CATCH_SIGNALS. + +--- lex.c.orig 2017-03-15 21:28:13.000000000 +0000 ++++ lex.c +@@ -927,8 +927,10 @@ LexInit (void) + rl_getc_function = ReadlineGetChar; + rl_prep_term_function = my_prep_terminal; + rl_deprep_term_function = my_deprep_terminal; ++#if HAVE_RL_CATCH_SIGNALS + rl_catch_signals = 0; + #endif ++#endif + LexInputReference = NewReference ((void **) &lexInput); + MemAddRoot (LexInputReference); + EXIT (); |