|
 |
3c77645 |
--- a/libeantic/configure.ac 2021-06-25 08:06:12.000000000 -0600
|
|
|
3c77645 |
+++ b/libeantic/configure.ac 2021-06-26 16:49:08.179099722 -0600
|
|
|
3c77645 |
@@ -28,8 +28,6 @@ AC_PROG_INSTALL
|
|
|
3c77645 |
dnl We build our library with libtool.
|
|
|
3c77645 |
LT_INIT
|
|
|
3c77645 |
|
|
|
3c77645 |
-AC_CONFIG_LIBOBJ_DIR([upstream/patched])
|
|
|
3c77645 |
-
|
|
|
3c77645 |
## Test for valgrind test suite
|
|
|
3c77645 |
AX_VALGRIND_DFLT([sgcheck], [off])
|
|
|
3c77645 |
AX_VALGRIND_DFLT([drd], [off])
|
|
|
3c77645 |
@@ -55,15 +53,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
|
|
|
3c77645 |
AC_CHECK_HEADERS(antic/nf.h antic/nf_elem.h, , [AC_MSG_ERROR([antic headers not found])])
|
|
|
3c77645 |
AC_CHECK_LIB(antic, nf_init, [], [AC_MSG_ERROR([libantic not found])])
|
|
|
3c77645 |
|
|
|
3c77645 |
-# Check if we need to provide our own nf_init_randtest which was introduced in https://github.com/wbhart/antic/pull/47
|
|
|
3c77645 |
-AC_REPLACE_FUNCS(nf_init_randtest)
|
|
|
3c77645 |
-# Unconditionally patch nf_elem_scalar_div_fmpq which has aliasing issues in ANTIC, https://github.com/wbhart/antic/pull/48
|
|
|
3c77645 |
-AC_LIBOBJ(EANTIC_nf_elem_scalar_div_fmpq)
|
|
|
3c77645 |
-# Unconditionally patch fmpq_poly_add_fmpq which was fixed in https://github.com/wbhart/flint2/commit/17d26d4c957828f3c98c15ddec85108f841d3438
|
|
|
3c77645 |
-AC_LIBOBJ(EANTIC_fmpq_poly_add_fmpq)
|
|
|
3c77645 |
-# Unconditionally patch nf_elem_add_fmpq so it uses our patched fmpq_poly_add_fmpq
|
|
|
3c77645 |
-AC_LIBOBJ(EANTIC_nf_elem_add_fmpq)
|
|
|
3c77645 |
-
|
|
|
3c77645 |
AC_CHECK_HEADERS(arb.h arf.h, , [AC_MSG_ERROR([Arb header not found])])
|
|
|
3c77645 |
AC_SEARCH_LIBS(arb_init, [arb flint-arb],[], [AC_MSG_ERROR([libarb not found])])
|
|
|
3c77645 |
|
|
|
3c77645 |
--- a/libeantic/e-antic/renf_elem.h 2021-06-25 08:06:12.000000000 -0600
|
|
|
3c77645 |
+++ b/libeantic/e-antic/renf_elem.h 2021-06-26 19:22:54.519464883 -0600
|
|
|
3c77645 |
@@ -33,12 +33,6 @@ extern "C" {
|
|
|
3c77645 |
#define EANTIC_STR_D 2
|
|
|
3c77645 |
#define EANTIC_STR_ARB 4
|
|
|
3c77645 |
|
|
|
3c77645 |
-// Patch nf_elem_scalar_div & nf_elem_add_fmpq which have issues in the released version of ANTIC, see upstream/patched.
|
|
|
3c77645 |
-LIBEANTIC_API void EANTIC_nf_elem_scalar_div_fmpq(nf_elem_t a, const nf_elem_t b, const fmpq_t c, const nf_t nf);
|
|
|
3c77645 |
-#define nf_elem_scalar_div_fmpq(a, b, c, nf) EANTIC_nf_elem_scalar_div_fmpq(a, b, c, nf)
|
|
|
3c77645 |
-LIBEANTIC_API void EANTIC_nf_elem_add_fmpq(nf_elem_t a, const nf_elem_t b, const fmpq_t c, const nf_t nf);
|
|
|
3c77645 |
-#define nf_elem_add_fmpq(a, b, c, nf) EANTIC_nf_elem_add_fmpq(a, b, c, nf)
|
|
|
3c77645 |
-
|
|
|
3c77645 |
/// === Memory Layout ===
|
|
|
3c77645 |
/// A real embedded number field element
|
|
|
3c77645 |
typedef struct LIBEANTIC_API renf_elem
|
|
|
3c77645 |
--- a/libeantic/Makefile.am 2021-06-25 08:06:12.000000000 -0600
|
|
|
3c77645 |
+++ b/libeantic/Makefile.am 2021-06-26 16:49:45.610145920 -0600
|
|
|
3c77645 |
@@ -5,20 +5,3 @@ endif
|
|
|
3c77645 |
SUBDIRS = src srcxx test $(MAYBE_BENCHMARK)
|
|
|
3c77645 |
|
|
|
3c77645 |
ACLOCAL_AMFLAGS = -I m4
|
|
|
3c77645 |
-
|
|
|
3c77645 |
-# Distribute files that we might need to fill/replace from our dependencies
|
|
|
3c77645 |
-EXTRA_DIST = \
|
|
|
3c77645 |
- upstream/patched/EANTIC_fmpq_poly_add_fmpq.c \
|
|
|
3c77645 |
- upstream/patched/EANTIC_nf_elem_add_fmpq.c \
|
|
|
3c77645 |
- upstream/patched/EANTIC_nf_elem_scalar_div_fmpq.c \
|
|
|
3c77645 |
- upstream/patched/fmpq_poly_add_fmpq.c \
|
|
|
3c77645 |
- upstream/patched/nf.h \
|
|
|
3c77645 |
- upstream/patched/nf_elem.h \
|
|
|
3c77645 |
- upstream/patched/nf_elem_add_fmpq.c \
|
|
|
3c77645 |
- upstream/patched/nf_elem_scalar_div_fmpq.c \
|
|
|
3c77645 |
- upstream/patched/nf_init_randtest.c
|
|
|
3c77645 |
-
|
|
|
3c77645 |
-# Probably a bug in autotools:
|
|
|
3c77645 |
-# .libs in AC_CONFIG_LIBOBJ_DIR is not cleaned automatically.
|
|
|
3c77645 |
-mostlyclean-local:
|
|
|
3c77645 |
- -rm -rf upstream/patched/.libs
|