diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2017-01-06 21:38:11 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2017-01-06 21:38:11 +0000 |
| commit | db507191569d55584f875e2f3bc60f4309f50970 (patch) | |
| tree | 3f4b6231d615e1cee357c189e5e0a241b47c1de4 | |
| parent | Unbreak configure with zlib 1.2.10, configure script believes that version (diff) | |
Fix configure with zlib 1.2.10, configure script believes that version
1.2.10 is lower than 1.2.5
Reported by: pkg-fallout
MFH: 2017Q1
Notes
Notes:
svn path=/head/; revision=430752
| -rw-r--r-- | math/R/Makefile | 1 | ||||
| -rw-r--r-- | math/libRmath/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/math/R/Makefile b/math/R/Makefile index e8442f60f945..b3fbfd361e7f 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -18,6 +18,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ CONFIGURE_ARGS= --disable-java \ --with-readline \ rdocdir=${DOCSDIR} +CONFIGURE_ENV= r_cv_header_zlib_h=yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip ONLY_FOR_ARCHS= i386 amd64 diff --git a/math/libRmath/Makefile b/math/libRmath/Makefile index 32864efedcf0..643209f42d28 100644 --- a/math/libRmath/Makefile +++ b/math/libRmath/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --disable-nls --with-ICU=no --with-cairo=no \ --with-jpeglib=no --with-libpng=no --with-libtiff=no \ --with-readline=no --with-tcltk=no --with-x=no \ --without-libintl-prefix -CONFIGURE_ENV+= ac_cv_header_iconv_h=no +CONFIGURE_ENV+= ac_cv_header_iconv_h=no r_cv_header_zlib_h=yes GNU_CONFIGURE= yes RMATH_SOVERSION= 1 USES= fortran localbase |