No sysrandom. Fix instructions.

astropy · Mar 19, 2020 · 73bb5a8 · 73bb5a8
1 parent 9ec290e
commit 73bb5a8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 149 deletions.
diff --git a/astropy/utils/xml/setup_package.py b/astropy/utils/xml/setup_package.py
@@ -23,8 +23,7 @@ def get_extensions(build_type='release'):
         EXPAT_DIR = 'cextern/expat/lib'
         cfg['sources'].extend([
             join(EXPAT_DIR, fn) for fn in
-            ["xmlparse.c", "xmlrole.c", "xmltok.c", "xmltok_impl.c",
-             "loadlibrary.c"]])
+            ["xmlparse.c", "xmlrole.c", "xmltok.c", "xmltok_impl.c"]])
         cfg['include_dirs'].extend([XML_DIR, EXPAT_DIR])
         if sys.platform.startswith('linux'):
             # This is to ensure we only export the Python entry point

diff --git a/astropy/utils/xml/src/expat_config.h b/astropy/utils/xml/src/expat_config.h
@@ -50,7 +50,7 @@
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have `syscall' and `SYS_getrandom'. */
-#define HAVE_SYSCALL_GETRANDOM 1
+/* #undef HAVE_SYSCALL_GETRANDOM */
 
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1

diff --git a/cextern/expat/expat_config.h b/cextern/expat/expat_config.h
@@ -50,7 +50,7 @@
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have `syscall' and `SYS_getrandom'. */
-#define HAVE_SYSCALL_GETRANDOM 1
+/* #undef HAVE_SYSCALL_GETRANDOM */
 
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1

diff --git a/cextern/expat/lib/loadlibrary.c b/cextern/expat/lib/loadlibrary.c
diff --git a/cextern/trim_expat.sh b/cextern/trim_expat.sh
@@ -10,11 +10,11 @@ set -euv
 # tar xvf <PATH_TO_TAR>   # (e.g., expat-2.2.6.tar.bz2)
 # cd expat
 # ./buildconf.sh
-# ./configure
+# ./configure --without-getrandom --without-sys-getrandom
 # cp expat_config.h ../../astropy/utils/xml/src/
 # cd ..
 # ./trim_expat.sh
-# cd ../..
+# cd ..
 # git add . -u
 #
 # And if the trim script missed anything, try to remove the extra files