Package: blitz++ / 1:1.0.2+ds-2

debianization.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Description: debianization
 Meant to maintain a minimal debian/rules, to fix warnings,
 to address Debian specific stuff in general.
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2018-06-08

--- a/configure.ac
+++ b/configure.ac
@@ -71,8 +71,9 @@
 AC_CHECK_PROG(MAKEINFO, [makeinfo], [makeinfo], [""])
 AM_CONDITIONAL(MAKEINFO_DOC, [test -n "$MAKEINFO"])
 # texinfo documentation
-AC_CHECK_PROG(TEXI2HTML, [texi2html], [texi2html])
-AM_CONDITIONAL(TEXI2HTML_DOC, [test -n "$TEXI2HTML"])
+##DEPRECATED##AC_CHECK_PROG(TEXI2HTML, [texi2html], [texi2html])
+##DEPRECATED##AM_CONDITIONAL(TEXI2HTML_DOC, [test -n "$TEXI2HTML"])
+AM_CONDITIONAL(TEXI2HTML_DOC, [1])
 # Doxygen documentation
 AC_PROG_DOXYGEN
 
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,10 +2,10 @@
 # Written by Patrick Guio <patrick.guio@fys.uio.no>
 #
 
-SUBDIRS = examples stencils doxygen
+SUBDIRS = examples stencils #doxygen
 
-# docdir directory to install the doc (pdf ps html) 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+# docdir directory to install the doc (pdf ps html)
+docdir = $(datadir)/doc/$(PACKAGE)
 
 DVIPS=export TEXPICTS=$(srcdir); dvips
 AM_MAKEINFOFLAGS = --no-split -I$(srcdir)
--- a/m4/ac_cxx_flags_preset.m4
+++ b/m4/ac_cxx_flags_preset.m4
@@ -16,7 +16,7 @@
 
 dnl Set default values
 AR_FLAGS="-cru"
-LDFLAGS=
+LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"
 
 
 AC_MSG_CHECKING([whether using $CXX preset flags])
@@ -83,7 +83,7 @@
 			CXXFLAGS="-ftemplate-depth-40"
 			CXX_OPTIMIZE_FLAGS="-O2 -funroll-loops -fstrict-aliasing -fno-gcse"
 		else
-			CXXFLAGS=""
+			CXXFLAGS="$(dpkg-buildflags --get CXXFLAGS)"
 			CXX_OPTIMIZE_FLAGS="-O3 -funroll-loops -fstrict-aliasing -fomit-frame-pointer -ffast-math"
 		fi
 		CXX_DEBUG_FLAGS="-g -DBZ_DEBUG"
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -5,7 +5,7 @@
 # Blitz++ test suite makefile
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) $(BOOST_CPPFLAGS)
-AM_CXXFLAGS = @CXX_DEBUG_FLAGS@ -DBZ_DEBUG
+AM_CXXFLAGS = @CXX_DEBUG_FLAGS@ -DBZ_DEBUG -fpermissive
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 LDADD = $(top_builddir)/lib/libblitz.la $(BOOST_SERIALIZATION_LIB)