diff options
| author | brook <brook@pkgsrc.org> | 2019-07-31 20:01:41 +0000 |
|---|---|---|
| committer | brook <brook@pkgsrc.org> | 2019-07-31 20:01:41 +0000 |
| commit | e82c6d40865551e399b61d2f79546ae94b0df9f9 (patch) | |
| tree | dae5860c298c9498324c8114e39672b306a0a8be /math/R-nloptr/patches | |
| parent | b03aee4b109ddd071dd701b7f1e4b006cdf55811 (diff) | |
| download | pkgsrc-e82c6d40865551e399b61d2f79546ae94b0df9f9.tar.gz | |
R-nloptr: update to version 1.2.1.
Update to the canonical form of an R package.
Diffstat (limited to 'math/R-nloptr/patches')
| -rw-r--r-- | math/R-nloptr/patches/patch-configure | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/math/R-nloptr/patches/patch-configure b/math/R-nloptr/patches/patch-configure index bf9dec7c579..e9c50547703 100644 --- a/math/R-nloptr/patches/patch-configure +++ b/math/R-nloptr/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.1 2016/04/17 04:09:44 wen Exp $ +$NetBSD: patch-configure,v 1.2 2019/07/31 20:01:42 brook Exp $ Fix usage of conditionals in configure ---- configure.orig 2015-11-28 07:01:04.000000000 +0000 +--- configure.orig 2018-10-03 07:37:01.000000000 +0000 +++ configure -@@ -2953,8 +2953,8 @@ fi +@@ -2982,8 +2982,8 @@ nlopt_libs="" ## also use pkg-config to check for NLopt ## @@ -10,6 +10,15 @@ Fix usage of conditionals in configure - if test x"${PKGCONFIG}" == x"yes"; then +if test x"${nlopt_libs}" = x""; then + if test x"${PKGCONFIG}" = x"yes"; then - ## check via pkg-config for hiredis + ## check via pkg-config for nlopt if pkg-config --exists nlopt; then ## obtain cflags and obtain libs +@@ -3280,7 +3280,7 @@ fi + if test x"${nlopt_good}" = x"yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Now testing for NLopt versison number." >&5 + $as_echo "$as_me: Now testing for NLopt versison number." >&6;} +- if test x"${PKGCONFIG}" == x"yes"; then ++ if test x"${PKGCONFIG}" = x"yes"; then + ## check via pkg-config for version number of nlopt + if pkg-config --exists nlopt; then + ## obtain version number |