pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/math/R Override zlib 1.2.5 check in configure, it is n...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cad3fac9f02b
branches:  trunk
changeset: 352190:cad3fac9f02b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Sep 08 20:41:25 2016 +0000

description:
Override zlib 1.2.5 check in configure, it is not required. Unbreaks
NetBSD 7.0 and earlier.

diffstat:

 math/R/Makefile |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 7286b244be1c -r cad3fac9f02b math/R/Makefile
--- a/math/R/Makefile   Thu Sep 08 20:40:04 2016 +0000
+++ b/math/R/Makefile   Thu Sep 08 20:41:25 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2016/07/26 04:53:33 wen Exp $
+# $NetBSD: Makefile,v 1.168 2016/09/08 20:41:25 joerg Exp $
 
 DISTNAME=              R-3.3.1
 CATEGORIES=            math
@@ -69,6 +69,8 @@
 
 # Broken test for bzlib >= 1.0.5 in R 2.7.0
 CONFIGURE_ENV+=                r_cv_have_bzlib=yes
+# Override zlib 1.2.5 requirement
+CONFIGURE_ENV+=                r_cv_header_zlib_h=yes
 
 CONFIGURE_ENV+=                GETWD=${TOOLS_PWD_CMD}
 CONFIGURE_ENV+=                lt_cv_path_LD=${LD:Q}
@@ -128,7 +130,6 @@
 SUBST_FILES.fixwrap=   libtool
 SUBST_SED.fixwrap=     -e "s,${WRAPPER_BINDIR}/libtool,${PKG_LIBTOOL},g"
 
-BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.5
 BUILDLINK_API_DEPENDS.bzip2+=  bzip2>=1.0.5
 
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)



Home | Main Index | Thread Index | Old Index