Skip to content

Commit 5e88d6f

Browse files
committed
build/pkgs/rpy2: use SAGE_PYTHON_PACKAGE_CHECK in spkg-configure.m4
Our system package lists are generated with a special case that looks for SAGE_PYTHON_PACKAGE_CHECK when spkg-configure.m4 is present. The rpy2 package already had an spkg-configure.m4 relating to --disable-r, but its spkg-configure.m4 did not use SAGE_PYTHON_PACKAGE_CHECK. As a result, it was erroneously included in the package list. We now use SAGE_PYTHON_PACKAGE_CHECK for the usual "check" phase of SAGE_SPKG_CONFIGURE, which both allows the user to use rpy2 from the system and fixes the package list.
1 parent 33ba146 commit 5e88d6f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/pkgs/rpy2/spkg-configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SAGE_SPKG_CONFIGURE([rpy2], [
2-
sage_spkg_install_rpy2=yes
3-
], [dnl REQUIRED-CHECK
2+
SAGE_PYTHON_PACKAGE_CHECK([rpy2])
3+
], [dnl REQUIRED-CHECK
44
AC_REQUIRE([SAGE_SPKG_CONFIGURE_R])
55
dnl rpy2 is only needed when there is a usable system R
66
AS_VAR_IF([sage_spkg_install_r], [yes], [dnl

0 commit comments

Comments
 (0)