Skip to content

Commit d5514d6

Browse files
committed
build/pkgs/rpy2: switch to the standard python package spkg-configure.m4
Our system package lists are generated with a special case that looks for SAGE_PYTHON_PACKAGE_CHECK, so switching this spkg-configure.m4 to use it should prevent rpy2 from being included in the standard package list.
1 parent f85cc8a commit d5514d6

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

build/pkgs/rpy2/spkg-configure.m4

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
SAGE_SPKG_CONFIGURE([rpy2], [
2-
sage_spkg_install_rpy2=yes
3-
], [dnl REQUIRED-CHECK
4-
AC_REQUIRE([SAGE_SPKG_CONFIGURE_R])
5-
dnl rpy2 is only needed when there is a usable system R
6-
AS_VAR_IF([sage_spkg_install_r], [yes], [dnl
7-
AS_VAR_IF([sage_use_system_r], [installed], [dnl
8-
dnl Legacy SPKG installation of r
9-
AS_VAR_SET([SPKG_REQUIRE], [yes])
10-
], [dnl No system package, no legacy SPKG installation
11-
AS_VAR_SET([SPKG_REQUIRE], [no])
12-
])
13-
])
14-
])
1+
SAGE_SPKG_CONFIGURE([rpy2], [SAGE_PYTHON_PACKAGE_CHECK([rpy2])])

0 commit comments

Comments
 (0)