diff options
Diffstat (limited to 'sci-mathematics/topcom/files')
| -rw-r--r-- | sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch | 327 | ||||
| -rw-r--r-- | sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch | 238 |
2 files changed, 172 insertions, 393 deletions
diff --git a/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch deleted file mode 100644 index 154ccd0382b8..000000000000 --- a/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch +++ /dev/null @@ -1,327 +0,0 @@ -diff -U 3 -dHrN topcom-0.17.7.orig/src/Makefile.in topcom-0.17.7/src/Makefile.in ---- topcom-0.17.7.orig/src/Makefile.in 2016-07-08 12:46:13.000000000 +0200 -+++ topcom-0.17.7/src/Makefile.in 2016-09-25 20:22:51.729578197 +0200 -@@ -119,249 +119,206 @@ - am_B_A_OBJECTS = B_A.$(OBJEXT) - B_A_OBJECTS = $(am_B_A_OBJECTS) - B_A_LDADD = $(LDADD) --B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \ -- ../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \ -- ../external/lib/libgmp.a -+B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a - am_B_A_center_OBJECTS = B_A_center.$(OBJEXT) - B_A_center_OBJECTS = $(am_B_A_center_OBJECTS) - B_A_center_LDADD = $(LDADD) - B_A_center_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_B_D_OBJECTS = B_D.$(OBJEXT) - B_D_OBJECTS = $(am_B_D_OBJECTS) - B_D_LDADD = $(LDADD) --B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \ -- ../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \ -- ../external/lib/libgmp.a -+B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a - am_chiro2allfinetriangs_OBJECTS = chiro2allfinetriangs.$(OBJEXT) - chiro2allfinetriangs_OBJECTS = $(am_chiro2allfinetriangs_OBJECTS) - chiro2allfinetriangs_LDADD = $(LDADD) - chiro2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2alltriangs_OBJECTS = chiro2alltriangs.$(OBJEXT) - chiro2alltriangs_OBJECTS = $(am_chiro2alltriangs_OBJECTS) - chiro2alltriangs_LDADD = $(LDADD) - chiro2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2circuits_OBJECTS = chiro2circuits.$(OBJEXT) - chiro2circuits_OBJECTS = $(am_chiro2circuits_OBJECTS) - chiro2circuits_LDADD = $(LDADD) - chiro2circuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2cocircuits_OBJECTS = chiro2cocircuits.$(OBJEXT) - chiro2cocircuits_OBJECTS = $(am_chiro2cocircuits_OBJECTS) - chiro2cocircuits_LDADD = $(LDADD) - chiro2cocircuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2dual_OBJECTS = chiro2dual.$(OBJEXT) - chiro2dual_OBJECTS = $(am_chiro2dual_OBJECTS) - chiro2dual_LDADD = $(LDADD) - chiro2dual_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2finetriang_OBJECTS = chiro2finetriang.$(OBJEXT) - chiro2finetriang_OBJECTS = $(am_chiro2finetriang_OBJECTS) - chiro2finetriang_LDADD = $(LDADD) - chiro2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2finetriangs_OBJECTS = chiro2finetriangs.$(OBJEXT) - chiro2finetriangs_OBJECTS = $(am_chiro2finetriangs_OBJECTS) - chiro2finetriangs_LDADD = $(LDADD) - chiro2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2mintriang_OBJECTS = chiro2mintriang.$(OBJEXT) - chiro2mintriang_OBJECTS = $(am_chiro2mintriang_OBJECTS) - chiro2mintriang_LDADD = $(LDADD) - chiro2mintriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2nallfinetriangs_OBJECTS = chiro2nallfinetriangs.$(OBJEXT) - chiro2nallfinetriangs_OBJECTS = $(am_chiro2nallfinetriangs_OBJECTS) - chiro2nallfinetriangs_LDADD = $(LDADD) - chiro2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2nalltriangs_OBJECTS = chiro2nalltriangs.$(OBJEXT) - chiro2nalltriangs_OBJECTS = $(am_chiro2nalltriangs_OBJECTS) - chiro2nalltriangs_LDADD = $(LDADD) - chiro2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2nfinetriangs_OBJECTS = chiro2nfinetriangs.$(OBJEXT) - chiro2nfinetriangs_OBJECTS = $(am_chiro2nfinetriangs_OBJECTS) - chiro2nfinetriangs_LDADD = $(LDADD) - chiro2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2ntriangs_OBJECTS = chiro2ntriangs.$(OBJEXT) - chiro2ntriangs_OBJECTS = $(am_chiro2ntriangs_OBJECTS) - chiro2ntriangs_LDADD = $(LDADD) - chiro2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2placingtriang_OBJECTS = chiro2placingtriang.$(OBJEXT) - chiro2placingtriang_OBJECTS = $(am_chiro2placingtriang_OBJECTS) - chiro2placingtriang_LDADD = $(LDADD) - chiro2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_chiro2triangs_OBJECTS = chiro2triangs.$(OBJEXT) - chiro2triangs_OBJECTS = $(am_chiro2triangs_OBJECTS) - chiro2triangs_LDADD = $(LDADD) - chiro2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_cocircuits2facets_OBJECTS = cocircuits2facets.$(OBJEXT) - cocircuits2facets_OBJECTS = $(am_cocircuits2facets_OBJECTS) - cocircuits2facets_LDADD = $(LDADD) - cocircuits2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_cross_OBJECTS = cross.$(OBJEXT) - cross_OBJECTS = $(am_cross_OBJECTS) - cross_LDADD = $(LDADD) - cross_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_cube_OBJECTS = cube.$(OBJEXT) - cube_OBJECTS = $(am_cube_OBJECTS) - cube_LDADD = $(LDADD) - cube_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_cyclic_OBJECTS = cyclic.$(OBJEXT) - cyclic_OBJECTS = $(am_cyclic_OBJECTS) - cyclic_LDADD = $(LDADD) - cyclic_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_hypersimplex_OBJECTS = hypersimplex.$(OBJEXT) - hypersimplex_OBJECTS = $(am_hypersimplex_OBJECTS) - hypersimplex_LDADD = $(LDADD) - hypersimplex_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_lattice_OBJECTS = lattice.$(OBJEXT) - lattice_OBJECTS = $(am_lattice_OBJECTS) - lattice_LDADD = $(LDADD) - lattice_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2allfinetriangs_OBJECTS = points2allfinetriangs.$(OBJEXT) - points2allfinetriangs_OBJECTS = $(am_points2allfinetriangs_OBJECTS) - points2allfinetriangs_LDADD = $(LDADD) - points2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2alltriangs_OBJECTS = points2alltriangs.$(OBJEXT) - points2alltriangs_OBJECTS = $(am_points2alltriangs_OBJECTS) - points2alltriangs_LDADD = $(LDADD) - points2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2chiro_OBJECTS = points2chiro.$(OBJEXT) - points2chiro_OBJECTS = $(am_points2chiro_OBJECTS) - points2chiro_LDADD = $(LDADD) - points2chiro_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2facets_OBJECTS = points2facets.$(OBJEXT) - points2facets_OBJECTS = $(am_points2facets_OBJECTS) - points2facets_LDADD = $(LDADD) - points2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2finetriang_OBJECTS = points2finetriang.$(OBJEXT) - points2finetriang_OBJECTS = $(am_points2finetriang_OBJECTS) - points2finetriang_LDADD = $(LDADD) - points2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2finetriangs_OBJECTS = points2finetriangs.$(OBJEXT) - points2finetriangs_OBJECTS = $(am_points2finetriangs_OBJECTS) - points2finetriangs_LDADD = $(LDADD) - points2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2flips_OBJECTS = points2flips.$(OBJEXT) - points2flips_OBJECTS = $(am_points2flips_OBJECTS) - points2flips_LDADD = $(LDADD) - points2flips_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2nallfinetriangs_OBJECTS = points2nallfinetriangs.$(OBJEXT) - points2nallfinetriangs_OBJECTS = $(am_points2nallfinetriangs_OBJECTS) - points2nallfinetriangs_LDADD = $(LDADD) - points2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2nalltriangs_OBJECTS = points2nalltriangs.$(OBJEXT) - points2nalltriangs_OBJECTS = $(am_points2nalltriangs_OBJECTS) - points2nalltriangs_LDADD = $(LDADD) - points2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2nfinetriangs_OBJECTS = points2nfinetriangs.$(OBJEXT) - points2nfinetriangs_OBJECTS = $(am_points2nfinetriangs_OBJECTS) - points2nfinetriangs_LDADD = $(LDADD) - points2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2nflips_OBJECTS = points2nflips.$(OBJEXT) - points2nflips_OBJECTS = $(am_points2nflips_OBJECTS) - points2nflips_LDADD = $(LDADD) - points2nflips_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2ntriangs_OBJECTS = points2ntriangs.$(OBJEXT) - points2ntriangs_OBJECTS = $(am_points2ntriangs_OBJECTS) - points2ntriangs_LDADD = $(LDADD) - points2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2placingtriang_OBJECTS = points2placingtriang.$(OBJEXT) - points2placingtriang_OBJECTS = $(am_points2placingtriang_OBJECTS) - points2placingtriang_LDADD = $(LDADD) - points2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2triangs_OBJECTS = points2triangs.$(OBJEXT) - points2triangs_OBJECTS = $(am_points2triangs_OBJECTS) - points2triangs_LDADD = $(LDADD) - points2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_points2volume_OBJECTS = points2volume.$(OBJEXT) - points2volume_OBJECTS = $(am_points2volume_OBJECTS) - points2volume_LDADD = $(LDADD) - points2volume_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_santos_22_triang_OBJECTS = santos_22_triang.$(OBJEXT) - santos_22_triang_OBJECTS = $(am_santos_22_triang_OBJECTS) - santos_22_triang_LDADD = $(LDADD) - santos_22_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_santos_dim4_triang_OBJECTS = santos_dim4_triang.$(OBJEXT) - santos_dim4_triang_OBJECTS = $(am_santos_dim4_triang_OBJECTS) - santos_dim4_triang_LDADD = $(LDADD) - santos_dim4_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - am_santos_triang_OBJECTS = santos_triang.$(OBJEXT) - santos_triang_OBJECTS = $(am_santos_triang_OBJECTS) - santos_triang_LDADD = $(LDADD) - santos_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src-reg/libCHECKREG.a - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -591,9 +548,6 @@ - santos_22_triang_SOURCES = santos_22_triang.cc - LDADD = ../lib-src/libTOPCOM.a \ - ../lib-src-reg/libCHECKREG.a \ -- ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a \ -- ../external/lib/libgmp.a - - AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \ - -I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \ -diff -U 3 -dHrN topcom-0.17.7.orig/src-reg/Makefile.in topcom-0.17.7/src-reg/Makefile.in ---- topcom-0.17.7.orig/src-reg/Makefile.in 2016-07-08 12:46:13.000000000 +0200 -+++ topcom-0.17.7/src-reg/Makefile.in 2016-09-25 20:19:04.062645737 +0200 -@@ -102,8 +102,7 @@ - checkregularity_OBJECTS = $(am_checkregularity_OBJECTS) - checkregularity_LDADD = $(LDADD) - checkregularity_DEPENDENCIES = ../lib-src-reg/libCHECKREG.a \ -- ../lib-src/libTOPCOM.a ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a ../external/lib/libgmp.a -+ ../lib-src/libTOPCOM.a - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -257,9 +256,6 @@ - checkregularity_SOURCES = checkregularity.cc - LDADD = ../lib-src-reg/libCHECKREG.a \ - ../lib-src/libTOPCOM.a \ -- ../external/lib/libcddgmp.a \ -- ../external/lib/libgmpxx.a \ -- ../external/lib/libgmp.a - - AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \ - -I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \ diff --git a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch index deb1ad3ebbad..2b517b441ed3 100644 --- a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch +++ b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch @@ -1,7 +1,34 @@ -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2020-02-15 12:44:55.065569980 +0100 -+++ b/configure.ac 2020-02-15 14:08:21.905767776 +0100 -@@ -9,7 +9,9 @@ +From 27284e6a9cb95dcd274abbe184b21eed8a899904 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 7 May 2022 16:00:45 -0400 +Subject: [PATCH 1/3] Gentoo's existing build system patch + +--- + Makefile.am | 5 ----- + configure.ac | 8 +++----- + lib-src-reg/Makefile.am | 8 ++++---- + lib-src/Makefile.am | 8 ++++---- + src-reg/Makefile.am | 15 +++++---------- + src/Makefile.am | 14 +++++--------- + wrap-gmp-gmpxx/Makefile.am | 4 ++-- + 7 files changed, 23 insertions(+), 39 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5dd0de0..4586f79 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1 @@ + SUBDIRS = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples +-EXTRA_DIST = external/Makefile +-EXTRA_DIST += external/gmp-6.1.1.tar.bz2 +-EXTRA_DIST += external/cddlib-0.94f-TOPCOM.tar.gz +-EXTRA_DIST += external/gmpxx-patch +- +diff --git a/configure.ac b/configure.ac +index 6635345..a10fb97 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,9 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL AC_PROG_CXX @@ -12,7 +39,7 @@ diff -ur a/configure.ac b/configure.ac dnl Checks for libraries. dnl Replace `main' with a function in -lg: -@@ -18,10 +20,6 @@ +@@ -18,10 +20,6 @@ dnl Replace `main' with a function in -lstdc: dnl AC_CHECK_LIB(stdc, main) dnl Replace `main' with a function in -lstdc++: dnl AC_CHECK_LIB(stdc++, main) @@ -23,9 +50,35 @@ diff -ur a/configure.ac b/configure.ac dnl Check for soplex: AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.') -diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am ---- a/lib-src/Makefile.am 2020-02-15 12:44:55.145570436 +0100 -+++ b/lib-src/Makefile.am 2020-02-15 14:08:44.741903592 +0100 +diff --git a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am +index fc8b005..d07b8f8 100644 +--- a/lib-src-reg/Makefile.am ++++ b/lib-src-reg/Makefile.am +@@ -1,6 +1,6 @@ +-lib_LIBRARIES = libCHECKREG.a ++lib_LTLIBRARIES = libCHECKREG.la + +-libCHECKREG_a_SOURCES = \ ++libCHECKREG_la_SOURCES = \ + SPXinterface.cc \ + LPinterface.cc \ + RegularityCheck.cc +@@ -12,9 +12,9 @@ LPinterface.hh + + AM_CPPFLAGS = -I../lib-src + AM_CPPFLAGS += -I../wrap-gmp-gmpxx +-AM_CPPFLAGS += -I../external/include ++AM_CPPFLAGS += $(CPPFLAGS) + AM_CPPFLAGS += -I$(includedir) + + AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 + +-AM_CXXFLAGS = -O2 ++AM_CXXFLAGS = $(CXXFLAGS) +diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am +index b2358cc..90b735a 100644 +--- a/lib-src/Makefile.am ++++ b/lib-src/Makefile.am @@ -1,6 +1,6 @@ -lib_LIBRARIES = libTOPCOM.a +lib_LTLIBRARIES = libTOPCOM.la @@ -35,7 +88,7 @@ diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am Admissibles.cc \ CheckTriang.cc \ Circuits.cc \ -@@ -90,9 +90,9 @@ +@@ -90,9 +90,9 @@ VirtualChiro.hh AM_CPPFLAGS = -I../lib-src-reg AM_CPPFLAGS += -I../wrap-gmp-gmpxx @@ -47,49 +100,16 @@ diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am -AM_CXXFLAGS = -O2 -g +AM_CXXFLAGS = $(CXXFLAGS) -diff -ur a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am ---- a/lib-src-reg/Makefile.am 2020-02-15 12:44:55.165570550 +0100 -+++ b/lib-src-reg/Makefile.am 2020-02-15 14:08:22.921773817 +0100 -@@ -1,6 +1,6 @@ --lib_LIBRARIES = libCHECKREG.a -+lib_LTLIBRARIES = libCHECKREG.la +diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am +index a351951..38f8f9f 100644 +--- a/src-reg/Makefile.am ++++ b/src-reg/Makefile.am +@@ -2,20 +2,15 @@ bin_PROGRAMS = checkregularity --libCHECKREG_a_SOURCES = \ -+libCHECKREG_la_SOURCES = \ - SPXinterface.cc \ - LPinterface.cc \ - RegularityCheck.cc -@@ -12,9 +12,9 @@ - - AM_CPPFLAGS = -I../lib-src - AM_CPPFLAGS += -I../wrap-gmp-gmpxx --AM_CPPFLAGS += -I../external/include -+AM_CPPFLAGS += $(CPPFLAGS) - AM_CPPFLAGS += -I$(includedir) - - AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 - --AM_CXXFLAGS = -O2 -+AM_CXXFLAGS = $(CXXFLAGS) -diff -ur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2020-02-15 12:44:55.065569980 +0100 -+++ b/Makefile.am 2020-02-15 14:08:22.929773865 +0100 -@@ -1,6 +1 @@ - SUBDIRS = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples --EXTRA_DIST = external/Makefile --EXTRA_DIST += external/gmp-6.1.1.tar.bz2 --EXTRA_DIST += external/cddlib-0.94f-TOPCOM.tar.gz --EXTRA_DIST += external/gmpxx-patch -- -diff -ur a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2020-02-15 12:44:55.165570550 +0100 -+++ b/src/Makefile.am 2020-02-15 14:08:22.933773888 +0100 -@@ -83,18 +83,14 @@ - santos_dim4_triang_SOURCES = santos_dim4_triang.cc - santos_22_triang_SOURCES = santos_22_triang.cc + checkregularity_SOURCES = checkregularity.cc --LDADD = ../lib-src/libTOPCOM.a \ -- ../lib-src-reg/libCHECKREG.a \ +-LDADD = ../lib-src-reg/libCHECKREG.a \ +- ../lib-src/libTOPCOM.a \ - ../external/lib/libcddgmp.a \ - ../external/lib/libgmpxx.a \ - ../external/lib/libgmp.a @@ -103,20 +123,23 @@ diff -ur a/src/Makefile.am b/src/Makefile.am +AM_CPPFLAGS += $(CPPFLAGS) AM_CPPFLAGS += -I$(includedir) + -AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 +- +-AM_CXXFLAGS = -O2 +AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG --AM_CXXFLAGS = -O2 +AM_CXXFLAGS = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG -diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am ---- a/src-reg/Makefile.am 2020-02-15 12:44:55.165570550 +0100 -+++ b/src-reg/Makefile.am 2020-02-15 14:08:22.933773888 +0100 -@@ -2,20 +2,15 @@ - - checkregularity_SOURCES = checkregularity.cc +diff --git a/src/Makefile.am b/src/Makefile.am +index ff7e574..63a76fc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -83,18 +83,14 @@ santos_triang_SOURCES = santos_triang.cc + santos_dim4_triang_SOURCES = santos_dim4_triang.cc + santos_22_triang_SOURCES = santos_22_triang.cc --LDADD = ../lib-src-reg/libCHECKREG.a \ -- ../lib-src/libTOPCOM.a \ +-LDADD = ../lib-src/libTOPCOM.a \ +- ../lib-src-reg/libCHECKREG.a \ - ../external/lib/libcddgmp.a \ - ../external/lib/libgmpxx.a \ - ../external/lib/libgmp.a @@ -130,17 +153,16 @@ diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am +AM_CPPFLAGS += $(CPPFLAGS) AM_CPPFLAGS += -I$(includedir) - -AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -- --AM_CXXFLAGS = -O2 +AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG +-AM_CXXFLAGS = -O2 +AM_CXXFLAGS = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG -diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am ---- a/wrap-gmp-gmpxx/Makefile.am 2020-02-15 12:44:55.165570550 +0100 -+++ b/wrap-gmp-gmpxx/Makefile.am 2020-02-15 14:08:23.105774912 +0100 -@@ -3,6 +3,6 @@ +diff --git a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am +index b9ef8db..4c3f675 100644 +--- a/wrap-gmp-gmpxx/Makefile.am ++++ b/wrap-gmp-gmpxx/Makefile.am +@@ -3,6 +3,6 @@ Integer.h \ Rational.h AM_CPPFLAGS = -I../external/include @@ -149,3 +171,87 @@ diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am -AM_CXXFLAGS = -O2 +AM_CXXFLAGS = $(CXXFLAGS) +-- +2.35.1 + +From 1980a3cba20ac549f488d7e00a01d3eee61485be Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 7 May 2022 16:14:57 -0400 +Subject: [PATCH 2/3] configure.ac: don't try to invoke csh to print an + informational message. + +On systems that don't have csh, running "csh -c 'echo...'" will result +in an error; for example, + + ./configure: line 4102: csh: command not found + +Autoconf already provides macros to print the status and results of +various checks, so here we switch this particular invocation to make +use of AC_MSG_CHECKING and AC_MSG_RESULT. + +While we're at it, the old-fashioned AC_CHECK_LIB was updated to use +the newer AC_SEARCH_LIBS. +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a10fb97..0b2c0aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,7 +21,11 @@ dnl AC_CHECK_LIB(stdc, main) + dnl Replace `main' with a function in -lstdc++: + dnl AC_CHECK_LIB(stdc++, main) + dnl Check for soplex: +-AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.') ++AC_MSG_CHECKING([for soplex]) ++AC_SEARCH_LIBS([main], ++ [soplex], ++ [AC_MSG_RESULT([success])], ++ [AC_MSG_RESULT([failed, --soplex will not work])]) + + dnl Checks for header files. + AC_HEADER_STDC +-- +2.35.1 + +From 041f20f5712262ab99bfdfe29e20355d5e4fbf5d Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 7 May 2022 16:19:50 -0400 +Subject: [PATCH 3/3] configure.ac: run autoupdate. + +Autoconf-2.7x emits a few warnings while processing configure.ac. This +commit is the result of running "autoupdate" to fix them. +--- + configure.ac | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0b2c0aa..cddaef6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(TOPCOM, 0.17.8) ++AC_INIT([TOPCOM],[0.17.8]) + AC_CONFIG_SRCDIR(.) + + dnl Init automake. +@@ -27,12 +27,9 @@ AC_SEARCH_LIBS([main], + [AC_MSG_RESULT([success])], + [AC_MSG_RESULT([failed, --soplex will not work])]) + +-dnl Checks for header files. +-AC_HEADER_STDC + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + +-dnl Checks for library functions. +- +-AC_OUTPUT(wrap-gmp-gmpxx/Makefile lib-src/Makefile lib-src-reg/Makefile src/Makefile src-reg/Makefile examples/Makefile Makefile) ++AC_CONFIG_FILES([wrap-gmp-gmpxx/Makefile lib-src/Makefile lib-src-reg/Makefile src/Makefile src-reg/Makefile examples/Makefile Makefile]) ++AC_OUTPUT +-- +2.35.1 + |