[cmor] 188/190: 2.9.1-5
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit 73d38bce35dcefecdcfef7c3f0ac83bc7a2deb69
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jul 15 09:00:33 2015 +0100
2.9.1-5
---
debian/changelog | 28 +++++++++++++++++++++++++++-
debian/control | 11 ++++++++++-
debian/patches/ncldflags.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 4 ++--
debian/rules | 29 +++++++++++++++++++++++++----
5 files changed, 106 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 706be9e..c1e4fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,30 @@
-cmor (2.9.1-1) UNRELEASED; urgency=medium
+cmor (2.9.1-5) unstable; urgency=medium
+
+ * Fix typo that used wrong var name on conditional ppc64el build
+ in debian/rules. Thanks to pini. Closes: #755167.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 28 Jul 2014 10:18:06 +0100
+
+cmor (2.9.1-4) unstable; urgency=medium
+
+ * Make additional flags and pkgs a requirement for ppc64el only.
+ Closes: #755167, #754640.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 24 Jul 2014 19:05:11 +0100
+
+cmor (2.9.1-3) unstable; urgency=medium
+
+ * Add patch for ppc64el. Needs krb, gssapi and friends. Closes: #748947.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 11 Jul 2014 10:09:09 +0100
+
+cmor (2.9.1-2) unstable; urgency=medium
+
+ * Disable known broken tests on kfreebsd, s390x to allow transition.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 09 Jul 2014 11:51:45 +0100
+
+cmor (2.9.1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 5a9fa4e..69cf8e1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,16 @@ Source: cmor
Section: utils
Priority: extra
Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev, libudunits2-dev, libnetcdf-dev, uuid-dev, python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), libgfortran3, automake, python-numpy, gfortran
+Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev,
+ libudunits2-dev, libnetcdf-dev, uuid-dev,
+ python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), python-numpy,
+ libgfortran3, automake, gfortran, pkg-config,
+ libcurl4-gnutls-dev [ppc64el], libldap2-dev [ppc64el],
+ heimdal-multidev [ppc64el], libsqlite3-dev [ppc64el],
+ libsasl2-dev [ppc64el], libkeyutils-dev [ppc64el], libffi-dev [ppc64el],
+ libhdf5-mpi-dev | libhdf5-dev [ppc64el],
+ librtmp-dev [ppc64el],
+ libidn11-dev [ppc64el], libkrb5-dev [ppc64el]
Build-Conflicts: libcmor2, python-cmor, python3-cmor
Standards-Version: 3.9.5
X-Python-Version: >= 2.6
diff --git a/debian/patches/ncldflags.patch b/debian/patches/ncldflags.patch
new file mode 100644
index 0000000..1e530e6
--- /dev/null
+++ b/debian/patches/ncldflags.patch
@@ -0,0 +1,42 @@
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748947
+Description: Add support for ${EXTRA_NCLDFLAGS}, needed for ppc64el
+Forwarded: no
+Last-Updated: 2014-07-11
+
+Index: cmor-2.9.1/configure.ac
+===================================================================
+--- cmor-2.9.1.orig/configure.ac
++++ cmor-2.9.1/configure.ac
+@@ -217,27 +217,27 @@ if [ test ${with_netcdfb} != "-yes" ]; t
+ AC_CHECK_FILE([${with_netcdf}/bin/nc-config],[HAS_NCCONFIG=yes],[HAS_NCCONFIG=no])
+ if [ test ${HAS_NCCONFIG} == "yes" ] ; then
+ NCCFLAGS=`${with_netcdf}/bin/nc-config --cflags`
+- NCLDFLAGS=`${with_netcdf}/bin/nc-config --libs`
++ NCLDFLAGS="`${with_netcdf}/bin/nc-config --libs` ${EXTRA_NCLDFLAGS}"
+ else
+ NCCFLAGS=" -I${with_netcdf}/include"
+ if [ test ${RTAG} != "none" ] ; then
+ NCLDFLAGS=" -L${with_netcdf}/lib ${RTAG}${with_netcdf}/lib -lnetcdf"
+ else
+- NCLDFLAGS=" -L${with_netcdf}/lib -lnetcdf"
++ NCLDFLAGS=" -L${with_netcdf}/lib -lnetcdf ${EXTRA_NCLDFLAGS}"
+ fi
+ fi
+ else
+ NCCFLAGS="-lnetcdf"
+- NCLDFLAGS=""
++ NCLDFLAGS="${EXTRA_NCLDFLAGS}"
+ fi
+ else
+ AC_PATH_PROG(NCCONFIG,nc-config,"no")
+ if [ test NCCONFIG != "no" ] ; then
+ NCCFLAGS=`${NCCONFIG} --cflags`
+- NCLDFLAGS=`${NCCONFIG} --libs`
++ NCLDFLAGS="`${NCCONFIG} --libs` ${EXTRA_NCLDFLAGS}"
+ else
+ NCCFLAGS="-lnetcdf"
+- NCLDFLAGS=""
++ NCLDFLAGS="${EXTRA_NCLDFLAGS}"
+ fi
+ fi
+
diff --git a/debian/patches/series b/debian/patches/series
index 108ea0f..d8c80cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,10 +2,10 @@
shlib-link.patch
pkgconfig.patch
makefile-fix.patch
-ld-no-add-needed.patch
+# ld-no-add-needed.patch
destdir.patch
cmor_ver.patch
# python3.patch
silence-warning.patch
fix-makefile.patch
-
+ncldflags.patch
diff --git a/debian/rules b/debian/rules
index df8ba6f..ea121cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -13,11 +13,31 @@ export DEB_BUILD_MAINT_OPTIONS
BUILD_ARCH_OS :-= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+NETCDF_LIBS := $(shell pkg-config --libs heimdal-gssapi netcdf libffi)
PYVERS:=$(shell pyversions --supported)
DESTDIR:=$(shell pwd)/debian/tmp
-export CFLAGS:=-I/usr/include/ossp -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security $(CFLAGS)
+export CFLAGS:=-I/usr/include/ossp -fstack-protector \
+ --param=ssp-buffer-size=4 -Wformat -Wformat-security\
+ -Werror=format-security $(CFLAGS)
+
+DO_TEST:=true
+ifeq ($(BUILD_ARCH_OS)-$(BUILD_ARCH_CPU),kfreebsd-i386)
+ DO_TEST:=false
+endif
+ifeq ($(BUILD_ARCH_CPU),s390x)
+ DO_TEST:=false
+endif
+
+# As of July 2014, ppc64el appears to be a bit broken, as netcdf-dev
+# is not pulling in the libraries it needs. So we hard-code them here
+# and reinvestigate later.
+ifeq ($(BUILD_ARCH_CPU), ppc64el)
+ EXTRA_NCLDFLAGS:="-lhdf5 -lm -lcurl $(NETCDF_LIBS) -lz -lidn -lrtmp -lgcrypt \
+ -lgnutls -lgssapi_krb5 -llber -lldap_r -lgpg-error -ltasn1 -lp11-kit \
+ -lk5crypto -lkrb5support -lsasl2 -lkeyutils -lsqlite3"
+endif
%:
dh $@ --with python2
@@ -27,6 +47,7 @@ override_dh_auto_configure:
ln -sf /usr/share/misc/config.sub
dh_auto_configure -- --disable-color --enable-verbose-test --with-uuid --without-python \
UUIDLDFLAGS="-lossp-uuid" UUIDFLAGS="-I/usr/include/ossp" SZLIBFLAGS=nosz \
+ EXTRA_NCLDFLAGS="$(EXTRA_NCLDFLAGS)" \
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
override_dh_auto_clean:
@@ -41,7 +62,7 @@ override_dh_auto_build:
$(MAKE) FC=gfortran
override_dh_auto_test:
-ifeq ( $(BUILD_ARCH_OS)-$(BUILD_ARCH_CPU), kfreebsd-i386)
+ifeq ($(DO_TEST),false)
@echo "Tests disabled; see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598745"
else
dh_auto_test
@@ -64,4 +85,4 @@ override_dh_auto_install:
dh_install -p libcmor-dev cmor.pc $(LIBDIR)/pkgconfig
dh_link -p libcmor-dev $(LIBDIR)/libcmor.so.2 $(LIBDIR)/libcmor.so
dh_numpy
- dh_numpy3
+ # dh_numpy3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list