From 527d5a6161b476dfcfc723a9283ca796120e1fdf Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 16 Aug 2021 11:29:01 -0700 Subject: [PATCH] build/pkgs/pynac: Remove --- build/pkgs/pynac/SPKG.rst | 28 ----------- build/pkgs/pynac/checksums.ini | 5 -- build/pkgs/pynac/dependencies | 5 -- build/pkgs/pynac/distros/conda.txt | 1 - build/pkgs/pynac/distros/debian.txt | 1 - build/pkgs/pynac/distros/freebsd.txt | 1 - build/pkgs/pynac/distros/repology.txt | 1 - build/pkgs/pynac/package-version.txt | 1 - build/pkgs/pynac/patches/realpartloop.patch | 54 --------------------- build/pkgs/pynac/spkg-install.in | 45 ----------------- build/pkgs/pynac/type | 1 - build/pkgs/sagelib/dependencies | 2 +- 12 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 build/pkgs/pynac/SPKG.rst delete mode 100644 build/pkgs/pynac/checksums.ini delete mode 100644 build/pkgs/pynac/dependencies delete mode 100644 build/pkgs/pynac/distros/conda.txt delete mode 100644 build/pkgs/pynac/distros/debian.txt delete mode 100644 build/pkgs/pynac/distros/freebsd.txt delete mode 100644 build/pkgs/pynac/distros/repology.txt delete mode 100644 build/pkgs/pynac/package-version.txt delete mode 100644 build/pkgs/pynac/patches/realpartloop.patch delete mode 100644 build/pkgs/pynac/spkg-install.in delete mode 100644 build/pkgs/pynac/type diff --git a/build/pkgs/pynac/SPKG.rst b/build/pkgs/pynac/SPKG.rst deleted file mode 100644 index 61486cae128..00000000000 --- a/build/pkgs/pynac/SPKG.rst +++ /dev/null @@ -1,28 +0,0 @@ -pynac: A fork of the symbolic computation software GiNaC that uses Python objects -================================================================================= - -Description ------------ - -A modified version of GiNaC that replaces the dependency on CLN by -Python. - -License -------- - -GPL V2+ - - -Upstream Contact ----------------- - -- https://github.com/pynac/pynac -- http://pynac.org -- Burcin Erocal - burcin spam.erocal.org -- William Stein - wstein spam.gmail.com -- Mike Hansen - mhansen spam.gmail.com - -Dependencies ------------- - -Python diff --git a/build/pkgs/pynac/checksums.ini b/build/pkgs/pynac/checksums.ini deleted file mode 100644 index f4ac5637046..00000000000 --- a/build/pkgs/pynac/checksums.ini +++ /dev/null @@ -1,5 +0,0 @@ -tarball=pynac-VERSION.tar.bz2 -sha1=aed9f7fb94346d406afe248afdaa6ae0f6c2928b -md5=d5a2f75854f8a30c0d27ecdcadfdb78e -cksum=3621897717 -upstream_url=https://github.com/pynac/pynac/releases/download/pynac-VERSION/pynac-VERSION.tar.bz2 diff --git a/build/pkgs/pynac/dependencies b/build/pkgs/pynac/dependencies deleted file mode 100644 index 94337012126..00000000000 --- a/build/pkgs/pynac/dependencies +++ /dev/null @@ -1,5 +0,0 @@ -$(PYTHON) $(MP_LIBRARY) flint singular | pkgconf - ----------- -All lines of this file are ignored except the first. -It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/pynac/distros/conda.txt b/build/pkgs/pynac/distros/conda.txt deleted file mode 100644 index f28f855f90a..00000000000 --- a/build/pkgs/pynac/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -pynac diff --git a/build/pkgs/pynac/distros/debian.txt b/build/pkgs/pynac/distros/debian.txt deleted file mode 100644 index 5f088e68bcc..00000000000 --- a/build/pkgs/pynac/distros/debian.txt +++ /dev/null @@ -1 +0,0 @@ -libpynac-dev diff --git a/build/pkgs/pynac/distros/freebsd.txt b/build/pkgs/pynac/distros/freebsd.txt deleted file mode 100644 index e934d704e03..00000000000 --- a/build/pkgs/pynac/distros/freebsd.txt +++ /dev/null @@ -1 +0,0 @@ -math/pynac diff --git a/build/pkgs/pynac/distros/repology.txt b/build/pkgs/pynac/distros/repology.txt deleted file mode 100644 index f28f855f90a..00000000000 --- a/build/pkgs/pynac/distros/repology.txt +++ /dev/null @@ -1 +0,0 @@ -pynac diff --git a/build/pkgs/pynac/package-version.txt b/build/pkgs/pynac/package-version.txt deleted file mode 100644 index 1330c2bc537..00000000000 --- a/build/pkgs/pynac/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -0.7.29.p1 diff --git a/build/pkgs/pynac/patches/realpartloop.patch b/build/pkgs/pynac/patches/realpartloop.patch deleted file mode 100644 index 78d22093144..00000000000 --- a/build/pkgs/pynac/patches/realpartloop.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/ginac/power.cpp b/ginac/power.cpp -index 5c07324..8f2c179 100644 ---- a/ginac/power.cpp -+++ b/ginac/power.cpp -@@ -790,7 +790,9 @@ ex power::conjugate() const - - ex power::real_part() const - { -- if (exponent.is_integer()) { -+ if (is_exactly_a(exponent) -+ and ((ex_to(exponent).t == LONG) or (ex_to(exponent).t == MPZ))) { -+ numeric nexp = ex_to(exponent); - ex basis_real = basis.real_part(); - if (basis_real == basis) - return *this; -@@ -798,10 +800,10 @@ ex power::real_part() const - a.set_domain(domain::real); - b.set_domain(domain::real); - ex result; -- if (exponent.info(info_flags::posint)) -- result = power(a+I*b,exponent); -+ if (nexp >= 0) -+ result = power(a+I*b, nexp); - else -- result = power(a/(a*a+b*b)-I*b/(a*a+b*b),-exponent); -+ result = power(a/(a*a+b*b)-I*b/(a*a+b*b), -nexp); - result = result.expand(); - result = result.real_part(); - result = result.subs(lst( a==basis_real, b==basis.imag_part() )); -@@ -817,7 +819,9 @@ ex power::real_part() const - - ex power::imag_part() const - { -- if (exponent.info(info_flags::integer)) { -+ if (is_exactly_a(exponent) -+ and ((ex_to(exponent).t == LONG) or (ex_to(exponent).t == MPZ))) { -+ numeric nexp = ex_to(exponent); - ex basis_real = basis.real_part(); - if (basis_real == basis) - return 0; -@@ -825,10 +829,10 @@ ex power::imag_part() const - a.set_domain(domain::real); - b.set_domain(domain::real); - ex result; -- if (exponent.info(info_flags::posint)) -- result = power(a+I*b,exponent); -+ if (nexp >= 0) -+ result = power(a+I*b, nexp); - else -- result = power(a/(a*a+b*b)-I*b/(a*a+b*b),-exponent); -+ result = power(a/(a*a+b*b)-I*b/(a*a+b*b), -nexp); - result = result.expand(); - result = result.imag_part(); - result = result.subs(lst( a==basis_real, b==basis.imag_part() )); diff --git a/build/pkgs/pynac/spkg-install.in b/build/pkgs/pynac/spkg-install.in deleted file mode 100644 index 9fa0d99b2ed..00000000000 --- a/build/pkgs/pynac/spkg-install.in +++ /dev/null @@ -1,45 +0,0 @@ -########################################### -## pynac -########################################### - -export CXXFLAGS="-O2 -g $(echo $CXXFLAGS | sed 's/-fvisibility-inlines-hidden//g')" - -WORKDIR=${PWD}/src -PYNACDIR=${WORKDIR} - -build_pynac() -{ - cd ${PYNACDIR} - PKG_CONFIG_PATH=${SAGE_LOCAL}/lib/pkgconfig; export PKG_CONFIG_PATH - sdh_configure --disable-static --with-giac=no PYTHON=python3 - sdh_make - cd ${WORKDIR} -} - -install_pynac() -{ - rm ${SAGE_LOCAL}/lib/*ginac* - rm ${SAGE_LOCAL}/lib/*pynac* - rm -rf ${SAGE_LOCAL}/include/ginac - rm -rf ${SAGE_LOCAL}/include/pynac - cd ${PYNACDIR} - sdh_make_install - cd ${WORKDIR} -} - -clean_pynac() -{ - true -} - - -cd src - -echo "Starting build..." -echo "Running build_pynac..." -build_pynac -echo "Done build_pynac." - -echo "Installing pynac..." -install_pynac -echo "Done installing pynac." diff --git a/build/pkgs/pynac/type b/build/pkgs/pynac/type deleted file mode 100644 index a6a7b9cd726..00000000000 --- a/build/pkgs/pynac/type +++ /dev/null @@ -1 +0,0 @@ -standard diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies index 817640965dd..37bbab9f9bc 100644 --- a/build/pkgs/sagelib/dependencies +++ b/build/pkgs/sagelib/dependencies @@ -1,4 +1,4 @@ -FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy pycygwin pynac $(PYTHON) ratpoints rw sage_conf singular symmetrica zn_poly $(PCFILES) +FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy pycygwin $(PYTHON) ratpoints rw sage_conf singular symmetrica zn_poly $(PCFILES) ---------- All lines of this file are ignored except the first.