[cdo] 24/84: Try --as-needed in autoreconf

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdo.

commit 45d6dc1cd0cf2c1f1cd575f177c5ceceecfb4eb7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jun 20 02:55:11 2013 +0100

    Try --as-needed in autoreconf
---
 debian/control |  2 +-
 debian/rules   | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 0b89adc..869fd48 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: Climate Data Operators
 Package: libcdi0
 Section: libs
 Architecture: any
-Priority: extra
+Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
diff --git a/debian/rules b/debian/rules
index eb14bb4..645655d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # The magic debhelper  rule
 %:
-	dh $@ 
+	dh $@ --with autoreconf
 
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -23,6 +23,8 @@ ARCH:=$(shell dpkg --print-architecture)
 WITH_GRIB:= --with-grib-api=/usr --disable-cgribex
 WITH_JASPER:= --with-jasper=/usr
 
+# export LIBTOOLIZE=true
+
 # On amd64, arm*, don't do fPIE, only relro
 ifeq ($(ARCH), amd64)
   export LDFLAGS= -Wl,-z,relro -Wl,-z,now
@@ -50,29 +52,33 @@ endif
 
 override_dh_auto_clean:
 	dh_auto_clean	|| echo "distclean ok"
+	#rm -f cdo.settings src/config.h  libtool libcdi/config.log libcdi/config.status src/stamp-h1 confdefs.h
 	rm -f Makefile missing config.status config.log libcdi/tests/libcdi.a
 	rm -f config/compile config/mkinstalldirs config/config.guess config/config.sub
-	rm -f src/config.h.in aclocal.m4 config/depcomp config/install-sh config/ltmain.sh config/missing configure INSTALL
+	rm -f src/config.h.in aclocal.m4 config/depcomp config/install-sh config/missing configure INSTALL
 	rm -f libcdi/INSTALL libcdi/aclocal.m4 m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
 	rm -f libcdi/m4/libtool.m4 libcdi/m4/ltoptions.m4 libcdi/m4/ltversion.m4 libcdi/configure
 	rm -f libcdi/config/config.guess libcdi/config/config.sub libcdi/config/depcomp libcdi/config/install-sh 
-	rm -f libcdi/config/ltmain.sh libcdi/config/missing libcdi/config/mkinstalldirs
+	rm -f libcdi/config/missing libcdi/config/mkinstalldirs
 	find . -name Makefile.in -delete
+	find . -name Makefile -delete
 	find . -type l -delete
 	rm -rf src/.deps
 
 
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
 override_dh_auto_configure:
 	ln -sf /usr/include/cfortran.h libcdi/src/cfortran.h 
-	dh_autoreconf
-	LDFLAGS="$(LDFLAGS) -Wl,--as-needed"  
 	  ./configure --prefix=/usr --libdir=$(LIBDIR) \
 		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr --with-hdf5=/usr \
 		--enable-iso-c-interface   --with-magics=/usr \
-		 $(WITH_GRIB) $(WITH_JASPER)  FC=gfortran LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl"
-	rm -f libtool libcdi/libtool
-	ln -sf /usr/bin/libtool libtool
-	ln -sf /usr/bin/libtool libcdi/libtool
+		 $(WITH_GRIB) $(WITH_JASPER)  FC=gfortran \
+		LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl"
+	#rm -f libtool libcdi/libtool
+	#ln -sf /usr/bin/libtool libtool
+	#ln -sf /usr/bin/libtool libcdi/libtool
 
 override_dh_auto_install:
 	dh_auto_install
@@ -84,4 +90,6 @@ override_dh_auto_install:
 
 override_dh_auto_test:
 	# Need to define path to 'cdo' for python tests
-	export PATH=$(PATH):$(TOPDIR)/src make check
+	# export PATH=$(PATH):$(TOPDIR)/src make check
+	#test/Makefile.am:5: error: using '$(top_srcdir)' in TESTS is currently broken: '$(top_srcdir)/test/test_info.py'
+	@echo "Tests currently disabled"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git