[patch] New patch, fixing the build system to use the currently built version in the testsuite

blitz-1.0.1-fix-lib-reference.patch (text/plain), 3.99 KB, created by Yann Leprince on 2017-11-22 17:23:50 UTC

diff -ru blitz-1.0.1/benchmarks/Makefile.am blitz-1.0.1-fixed/benchmarks/Makefile.am
--- blitz-1.0.1/benchmarks/Makefile.am	2017-10-02 18:04:43.000000000 +0200
+++ blitz-1.0.1-fixed/benchmarks/Makefile.am	2017-11-22 12:39:03.436451254 +0100
@@ -16,7 +16,7 @@
 AM_CXXFLAGS = @CXX_OPTIMIZE_FLAGS@ @CXXFFLAGS@ @CXXFCFLAG@
 AM_FFLAGS = @F77_OPTIMIZE_FLAGS@
 AM_FCFLAGS = $(FCFLAGS_f90) @FC_OPTIMIZE_FLAGS@
-LDADD = -L$(top_builddir)/lib -lblitz @BLASLIB@ @FCLIBS@ @FLIBS@
+LDADD = $(top_builddir)/lib/libblitz.la @BLASLIB@ @FCLIBS@ @FLIBS@
 
 
 ############################################################################
diff -ru blitz-1.0.1/doc/examples/Makefile.am blitz-1.0.1-fixed/doc/examples/Makefile.am
--- blitz-1.0.1/doc/examples/Makefile.am	2017-10-02 18:04:43.000000000 +0200
+++ blitz-1.0.1-fixed/doc/examples/Makefile.am	2017-11-22 12:39:29.559338431 +0100
@@ -6,7 +6,7 @@
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
 AM_CXXFLAGS = @CXX_DEBUG_FLAGS@
-LDADD = -L$(top_builddir)/lib -lblitz
+LDADD = $(top_builddir)/lib/libblitz.la
 
 EXAMPLES = simple storage outer strideslice slicing debug output io dump xor \
 cast range fixed
diff -ru blitz-1.0.1/doc/stencils/Makefile.am blitz-1.0.1-fixed/doc/stencils/Makefile.am
--- blitz-1.0.1/doc/stencils/Makefile.am	2017-10-02 18:04:43.000000000 +0200
+++ blitz-1.0.1-fixed/doc/stencils/Makefile.am	2017-11-22 12:39:36.729215975 +0100
@@ -5,7 +5,7 @@
 EXTRA_DIST = dump-stencil.cpp
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
-LDADD = -L$(top_builddir)/lib -lblitz
+LDADD = $(top_builddir)/lib/libblitz.la
 COMPILE = $(CXX) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 
 LTCXXCOMPILE = $(LIBTOOL) --mode=link $(CXX) $(DEFS) \
diff -ru blitz-1.0.1/examples/Makefile.am blitz-1.0.1-fixed/examples/Makefile.am
--- blitz-1.0.1/examples/Makefile.am	2017-10-02 18:04:43.000000000 +0200
+++ blitz-1.0.1-fixed/examples/Makefile.am	2017-11-22 12:38:01.630840174 +0100
@@ -5,7 +5,7 @@
 EXTRA_DIST = stencil4.f profile.cpp tiny2.cpp tiny3.cpp
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) $(BOOST_CPPFLAGS)
-LDADD = -L$(top_builddir)/lib -lblitz 
+LDADD = $(top_builddir)/lib/libblitz.la
 
 EXTRA_PROGRAMS = arrayx cartesian cast complex-test convolve \
 deriv fixed io iter matmult nested numinquire outer \
diff -ru blitz-1.0.1/manual/examples/Makefile.am blitz-1.0.1-fixed/manual/examples/Makefile.am
--- blitz-1.0.1/manual/examples/Makefile.am	2017-10-02 18:04:43.000000000 +0200
+++ blitz-1.0.1-fixed/manual/examples/Makefile.am	2017-11-22 12:39:44.705746411 +0100
@@ -9,7 +9,7 @@
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
 AM_CXXFLAGS = @CXX_DEBUG_FLAGS@
-LDADD = -L$(top_builddir)/lib -lblitz
+LDADD = $(top_builddir)/lib/libblitz.la
 
 EXAMPLES = 	simple slicing debug xor cast dump output outer \
 		strideslice range storage
diff -ru blitz-1.0.1/manual/stencils/Makefile.am blitz-1.0.1-fixed/manual/stencils/Makefile.am
--- blitz-1.0.1/manual/stencils/Makefile.am	2017-10-02 18:04:43.000000000 +0200
+++ blitz-1.0.1-fixed/manual/stencils/Makefile.am	2017-11-22 12:39:51.122303488 +0100
@@ -14,7 +14,7 @@
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
 AM_CXXFLAGS = @CXX_DEBUG_FLAGS@ -Dstenciltodump=Laplacian2D4
-LDADD = -L$(top_builddir)/lib -lblitz
+LDADD = $(top_builddir)/lib/libblitz.la
 
 SINGLE_TESTS = dump-stencil
 
diff -ru blitz-1.0.1/testsuite/Makefile.am blitz-1.0.1-fixed/testsuite/Makefile.am
--- blitz-1.0.1/testsuite/Makefile.am	2017-10-02 18:04:43.000000000 +0200
+++ blitz-1.0.1-fixed/testsuite/Makefile.am	2017-11-22 12:38:44.870101684 +0100
@@ -9,7 +9,7 @@
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) $(BOOST_CPPFLAGS)
 AM_CXXFLAGS = @CXX_DEBUG_FLAGS@ -DBZ_DEBUG
 AM_LDFLAGS = $(BOOST_LDFLAGS)
-LDADD = -L$(top_builddir)/lib -lblitz $(BOOST_SERIALIZATION_LIB)
+LDADD = $(top_builddir)/lib/libblitz.la $(BOOST_SERIALIZATION_LIB)
 
 EXTRA_PROGRAMS = 64bit Adnene-Ben-Abdallah-1 Adnene-Ben-Abdallah-2     \
 alignment arrayresize arrayinitialize bitwise chris-jeffery-1 chris-jeffery-2  \