diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-mathematics/flint/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-mathematics/flint/files')
6 files changed, 278 insertions, 0 deletions
diff --git a/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch b/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch new file mode 100644 index 000000000000..f0a2ec8531b0 --- /dev/null +++ b/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch @@ -0,0 +1,33 @@ +commit afadc8d05674a0e3e2fcf6dfbcf5f3c8f9133119 +Author: hasufell <hasufell@hasufell.de> +Date: Sun May 18 19:32:59 2014 +0200 + + Respect CFLAGS/CXXFLAGS/LDFLAGS, fixes #66 + + Even in linking command CFLAGS should be respected, no matter + if all objects have already been compiled or not. Some flags + affect both linking and object compilation and users shouldn't + be required to figure them out. This is standard in most build + systems anyway. + + Reorderd the linker line a bit, so it matches common practice, + although this doesn't matter technically (except that LDFLAGS + must go before libraries we link against). + +diff --git a/Makefile.in b/Makefile.in +index a522ac1..6dda689 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -104,10 +104,10 @@ $(FLINT_LIB): $(LOBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) | + $(AT)$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); BUILD_DIR=../build/$(dir); export BUILD_DIR; MOD_DIR=$(dir); export MOD_DIR; $(MAKE) -f ../Makefile.subdirs -C $(dir) shared || exit $$?;) + $(AT)if [ "$(WANT_NTL)" -eq "1" ]; then \ + $(MAKE) build/interfaces/NTL-interface.lo; \ +- $(CXX) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \ ++ $(CXX) $(CXXFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \ + fi + $(AT)if [ "$(WANT_NTL)" -ne "1" ]; then \ +- $(CC) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \ ++ $(CC) $(CFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \ + fi + + libflint.a: $(OBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) | build build/interfaces diff --git a/sci-mathematics/flint/files/flint-2.4.3-libdir.patch b/sci-mathematics/flint/files/flint-2.4.3-libdir.patch new file mode 100644 index 000000000000..a569be40b8b8 --- /dev/null +++ b/sci-mathematics/flint/files/flint-2.4.3-libdir.patch @@ -0,0 +1,44 @@ +From 27eb23c1844029ee64907500bd8aa87097ffcd32 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Sun, 18 May 2014 18:46:24 +0200 +Subject: [PATCH] Allow to control LIBDIR + +Some distributions have lib32/lib64 and need to control +the destination properly. +--- + Makefile.in | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index c16f838..b6ea4c9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4,6 +4,8 @@ else + $(DLPATH):=$(DLPATH_ADD) + endif + ++LIBDIR=lib ++ + QUIET_CC = @echo ' ' CC ' ' $@; + QUIET_CXX = @echo ' ' CXX ' ' $@; + QUIET_AR = @echo ' ' AR ' ' $@; +@@ -169,13 +171,13 @@ else + endif + + install: library +- mkdir -p $(DESTDIR)$(PREFIX)/lib ++ mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR) + mkdir -p $(DESTDIR)$(PREFIX)/include/flint + $(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \ +- cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/lib; \ ++ cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \ + fi + $(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \ +- cp libflint.a $(DESTDIR)$(PREFIX)/lib; \ ++ cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \ + fi + cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint + $(AT)if [ ! -z $(EXT_HEADERS) ]; then \ +-- +1.9.3 + diff --git a/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch b/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch new file mode 100644 index 000000000000..3d63aedeab3c --- /dev/null +++ b/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch @@ -0,0 +1,54 @@ +From 3506d617ef9dfc5184aa99be05a25e4f73d6c3f6 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Sun, 18 May 2014 18:47:27 +0200 +Subject: [PATCH] Quote variables that could contain whitespaces + +Make does NOT take care of this in this context. It's +not a variable assignment and installation would fail +if DESTDIR contains any whitespace. +--- + Makefile.in | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index b6ea4c9..a522ac1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -171,23 +171,23 @@ else + endif + + install: library +- mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR) +- mkdir -p $(DESTDIR)$(PREFIX)/include/flint ++ mkdir -p "$(DESTDIR)$(PREFIX)/$(LIBDIR)" ++ mkdir -p "$(DESTDIR)$(PREFIX)/include/flint" + $(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \ +- cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \ ++ cp $(FLINT_LIB) "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \ + fi + $(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \ +- cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \ ++ cp libflint.a "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \ + fi +- cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint ++ cp $(HEADERS) "$(DESTDIR)$(PREFIX)/include/flint" + $(AT)if [ ! -z $(EXT_HEADERS) ]; then \ +- cp $(EXT_HEADERS) $(DESTDIR)$(PREFIX)/include/flint; \ ++ cp $(EXT_HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"; \ + fi +- mkdir -p $(DESTDIR)$(FLINT_CPIMPORT_DIR) +- cp qadic/CPimport.txt $(DESTDIR)$(FLINT_CPIMPORT_DIR) +- mkdir -p $(DESTDIR)$(PREFIX)/include/flint/flintxx +- cp flintxx/*.h $(DESTDIR)$(PREFIX)/include/flint/flintxx +- cp *xx.h $(DESTDIR)$(PREFIX)/include/flint ++ mkdir -p "$(DESTDIR)$(FLINT_CPIMPORT_DIR)" ++ cp qadic/CPimport.txt "$(DESTDIR)$(FLINT_CPIMPORT_DIR)" ++ mkdir -p "$(DESTDIR)$(PREFIX)/include/flint/flintxx" ++ cp flintxx/*.h "$(DESTDIR)$(PREFIX)/include/flint/flintxx" ++ cp *xx.h "$(DESTDIR)$(PREFIX)/include/flint" + + build: + mkdir -p build +-- +1.9.3 + diff --git a/sci-mathematics/flint/files/flint-2.4.4-test.patch b/sci-mathematics/flint/files/flint-2.4.4-test.patch new file mode 100644 index 000000000000..11b7cfe21115 --- /dev/null +++ b/sci-mathematics/flint/files/flint-2.4.4-test.patch @@ -0,0 +1,19 @@ +commit 5e3d4a0504158f70d227e7cfc03985fe9a646797 +Author: hasufell <hasufell@hasufell.de> +Date: Wed Jul 2 12:58:50 2014 +0200 + + Fix NTL test build + +diff --git a/Makefile.in b/Makefile.in +index 6dda689..e9de7da 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -214,7 +214,7 @@ build/interfaces/NTL-interface.o: interfaces/NTL-interface.cpp NTL-interface.h + $(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) -c $< -o $@; + + build/interfaces/test/t-NTL-interface$(EXEEXT): interfaces/test/t-NTL-interface.cpp +- $(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.o -o $@ $(LIBS); ++ $(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.lo -o $@ $(LIBS); + + print-%: + @echo '$*=$($*)' diff --git a/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch b/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch new file mode 100644 index 000000000000..559cbe51fb28 --- /dev/null +++ b/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch @@ -0,0 +1,115 @@ +From a7f911140e7d0a0125653a40aa2c5fe257bd78f5 Mon Sep 17 00:00:00 2001 +From: Fredrik Johansson <fredrik.johansson@gmail.com> +Date: Thu, 18 Sep 2014 14:49:05 +0200 +Subject: [PATCH] redefine fmpz_invmod to consider any integer invertible mod 1 + (for gmp 6.0 compatibility) + +--- + fmpz/doc/fmpz.txt | 3 ++- + fmpz/invmod.c | 11 +++++++++-- + fmpz/test/t-invmod.c | 21 +++++++++++++++++---- + 3 files changed, 28 insertions(+), 7 deletions(-) + +diff --git a/fmpz/doc/fmpz.txt b/fmpz/doc/fmpz.txt +index fb422d8..2ada719 100644 +--- a/fmpz/doc/fmpz.txt ++++ b/fmpz/doc/fmpz.txt +@@ -899,7 +899,8 @@ int fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h) + Sets $f$ to the inverse of $g$ modulo $h$. The value of $h$ may + not be $0$ otherwise an exception results. If the inverse exists + the return value will be non-zero, otherwise the return value will +- be $0$ and the value of $f$ undefined. ++ be $0$ and the value of $f$ undefined. As a special case, we ++ consider any number invertible modulo $h = \pm 1$, with inverse 0. + + void fmpz_negmod(fmpz_t f, const fmpz_t g, const fmpz_t h) + +diff --git a/fmpz/invmod.c b/fmpz/invmod.c +index a0cf601..0e20f39 100644 +--- a/fmpz/invmod.c ++++ b/fmpz/invmod.c +@@ -67,7 +67,11 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h) + if (c2 < WORD(0)) + c2 = -c2; + if (c2 == WORD(1)) +- return 0; /* special case not handled by n_invmod */ ++ { ++ fmpz_zero(f); ++ return 1; /* special case not handled by n_invmod */ ++ } ++ + gcd = z_gcdinv(&inv, c1, c2); + + return (gcd == UWORD(1) ? fmpz_set_si(f, inv), 1 : 0); +@@ -106,7 +110,10 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h) + if (c2 < WORD(0)) + c2 = -c2; + if (c2 == WORD(1)) +- return 0; /* special case not handled by z_gcd_invert */ ++ { ++ fmpz_zero(f); ++ return 1; /* special case not handled by z_gcd_invert */ ++ } + /* reduce g mod h first */ + + r = flint_mpz_fdiv_ui(COEFF_TO_PTR(c1), c2); +diff --git a/fmpz/test/t-invmod.c b/fmpz/test/t-invmod.c +index aea236e..8ff1c7f 100644 +--- a/fmpz/test/t-invmod.c ++++ b/fmpz/test/t-invmod.c +@@ -30,6 +30,19 @@ + #include "ulong_extras.h" + #include "fmpz.h" + ++/* Use the definiton of GMP versions >= 6.0 */ ++int ++mpz_invert2(mpz_t a, const mpz_t b, const mpz_t c) ++{ ++ if (mpz_cmpabs_ui(c, 1) == 0) ++ { ++ mpz_set_ui(a, 0); ++ return 1; ++ } ++ else ++ return mpz_invert(a, b, c); ++} ++ + int + main(void) + { +@@ -63,7 +76,7 @@ main(void) + fmpz_get_mpz(e, b); + + r1 = fmpz_invmod(c, a, b); +- r2 = mpz_invert(f, d, e); ++ r2 = mpz_invert2(f, d, e); + + fmpz_get_mpz(g, c); + +@@ -106,7 +119,7 @@ main(void) + fmpz_get_mpz(d, a); + + r1 = fmpz_invmod(c, a, a); +- r2 = mpz_invert(f, d, d); ++ r2 = mpz_invert2(f, d, d); + + fmpz_get_mpz(g, c); + +@@ -149,7 +162,7 @@ main(void) + fmpz_get_mpz(e, b); + + r1 = fmpz_invmod(a, a, b); +- r2 = mpz_invert(f, d, e); ++ r2 = mpz_invert2(f, d, e); + + fmpz_get_mpz(g, a); + +@@ -192,7 +205,7 @@ main(void) + fmpz_get_mpz(e, b); + + r1 = fmpz_invmod(b, a, b); +- r2 = mpz_invert(f, d, e); ++ r2 = mpz_invert2(f, d, e); + + fmpz_get_mpz(g, b); + diff --git a/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch b/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch new file mode 100644 index 000000000000..e08fa774e298 --- /dev/null +++ b/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch @@ -0,0 +1,13 @@ +diff -druN flint-2.5.orig/interfaces/NTL-interface.cpp flint-2.5/interfaces/NTL-interface.cpp +--- flint-2.5.orig/interfaces/NTL-interface.cpp 2014-07-16 07:50:40.000000000 -0700 ++++ flint-2.5/interfaces/NTL-interface.cpp 2014-08-26 07:51:55.585884615 -0700 +@@ -32,9 +32,7 @@ + #include <NTL/ZZ.h> + #include <NTL/ZZX.h> + #include <NTL/mat_ZZ.h> +-#include <NTL/lip.h> + #include <NTL/ctools.h> +-#include <NTL/g_lip.h> + #include <gmp.h> + + #include "flint.h" |