Commit bef7116c authored by Julian Taylor's avatar Julian Taylor

Merge branch 'master' into ubuntu

Conflicts:
	debian/changelog
parents 05c605fb fac6aff4
fftw3 (3.3.2-3ubuntu1) quantal; urgency=low
* merge with Debian (LP: #1007259, #781726)
* remove the mpi packages not suitable for main
* remove the mpi packages not suitable for main
* add debian/source/extended-diff-ignore to ignore generated files
* add hardening flags to long long test so build log check does not complain
-- Julian Taylor <jtaylor.debian@googlemail.com> Sun, 10 Jun 2012 14:50:08 +0200
-- Julian Taylor <jtaylor.debian@googlemail.com> Thu, 21 Jun 2012 23:07:47 +0200
fftw3 (3.3.2-3) unstable; urgency=low
......
......@@ -78,7 +78,8 @@ build-arch:
#
# long double precision
# build only on architectures where double != long-double
gcc -o test_long_long-double debian/test_long_long-double.c
# flags added so build log checks don't report missing hardening flags
gcc $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o test_long_long-double debian/test_long_long-double.c
if ! ./test_long_long-double; then \
$(SETCFLAGS) ./configure --enable-long-double $(archconfflags) && \
$(MAKE) && \
......
extend-diff-ignore = "(^|/)(fftw3.info|fftw3.info-[12]|.*\.la|fftw[lf]*-wisdom|fftw[fl]*-wisdom.1)$"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment