From a8c637e25e28e0f9731dc7e2fc8b27854b9c7ca3 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Mon, 10 Feb 2020 16:02:20 +0100 Subject: [PATCH 1/2] add some .gitignore entries --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 7b5fe3a..87553f2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,9 @@ lib/Makefile.in lib/*.lo lib/*.o lib/*.la +*.dll* +*.dylib +*.exe *.tar.gz libtool m4/ @@ -24,3 +27,6 @@ tests/*.trs tests/*_test tests/Makefile tests/Makefile.in + +# editor temp files +*.sw[nop] From 6cfa6914f7ae2d6159410f955ec931eb1aa33008 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Fri, 7 Feb 2020 15:42:47 +0100 Subject: [PATCH 2/2] fix building of shared libraries on Windows-bases hosts includes no longer forcing disabling optimization by the configure script; this was resulting in over-linking of unused template instantions resulting in 'multiple definition of...' errors --- configure.ac | 5 ++++- lib/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 4915ad9..4d80612 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,9 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign -Wall]) AM_PROG_AR AC_PROG_CXX -LT_INIT +LT_INIT([shared win32-dll]) +AC_CANONICAL_HOST +AS_CASE([$host_os], [*cygwin* | *mingw*], [SIROCCO_LDFLAGS=-no-undefined]) +AC_SUBST(SIROCCO_LDFLAGS) AC_CONFIG_FILES([Makefile lib/Makefile tests/Makefile]) AC_OUTPUT diff --git a/lib/Makefile.am b/lib/Makefile.am index ca6f06e..ed33318 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libsirocco.la libsirocco_la_SOURCES = icomplex.cpp interval.cpp $(top_srcdir)/include/list.hpp $(top_srcdir)/include/mp_complex.hpp $(top_srcdir)/include/mp_icomplex.hpp $(top_srcdir)/include/mp_interval.hpp $(top_srcdir)/include/polynomial.hpp $(top_srcdir)/include/sirocco.hpp $(top_srcdir)/include/icomplex.hpp $(top_srcdir)/include/interval.hpp mp_complex.cpp mp_icomplex.cpp mp_interval.cpp polynomial.cpp sirocco.cpp -libsirocco_la_LDFLAGS = -lm -lmpfr -lgmp +libsirocco_la_LDFLAGS = $(SIROCCO_LDFLAGS) -lm -lmpfr -lgmp AM_CPPFLAGS = -I$(top_srcdir)/include include_HEADERS = $(top_srcdir)/include/sirocco.h