[Pkg-octave-commit] [octave-communications] 01/02: hdf5-ldflags.patch: new patch, inject HDF5 LDFLAGS in the build.

Sébastien Villemot sebastien at debian.org
Thu Aug 21 20:23:32 UTC 2014


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

sebastien pushed a commit to branch master
in repository octave-communications.

commit 3847d6f7e338766d1a3692012a197cb08208de72
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Aug 21 22:10:37 2014 +0200

    hdf5-ldflags.patch: new patch, inject HDF5 LDFLAGS in the build.
    
    Needed for the new HDF5 1.8.13 layout.
    
    Closes: #758733
---
 debian/patches/hdf5-ldflags.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/hdf5-ldflags.patch b/debian/patches/hdf5-ldflags.patch
new file mode 100644
index 0000000..c850a61
--- /dev/null
+++ b/debian/patches/hdf5-ldflags.patch
@@ -0,0 +1,27 @@
+Description: Inject LDFLAGS for HDF5
+ Needed for the new HDF5 1.8.13 layout.
+Author: Sébastien Villemot <sebastien at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758733
+Forwarded: no
+Last-Update: 2014-08-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,6 +3,7 @@ MKOCTFILE ?= mkoctfile
+ ## Quote filename to prevent backslashes in Windows file names from
+ ## disappearing.
+ HDF5_LIBS := $(shell grep "\#define OCTAVE_CONF_HDF5_LIBS" '$(shell $(MKOCTFILE) -p OCTINCLUDEDIR)/oct-conf.h' | sed 's/^.*LIBS //;s/"//g')
++HDF5_LDFLAGS := $(shell grep "\#define OCTAVE_CONF_HDF5_LDFLAGS" '$(shell $(MKOCTFILE) -p OCTINCLUDEDIR)/oct-conf.h' | sed 's/^.*LDFLAGS //;s/"//g')
+ 
+ GALOISTARGET = gf.oct
+ GALOISSOURCES = galois.cc galois-def.cc galoisfield.cc gf.cc \
+@@ -23,7 +24,7 @@ DEFINES = -DGALOIS_DISP_PRIVATES
+ all: $(GALOISTARGET) $(OTHERTARGETS)
+ 
+ $(GALOISTARGET): $(GALOISOBJECTS)
+-	$(MKOCTFILE) -o $@ $^ $(HDF5_LIBS)
++	$(MKOCTFILE) -o $@ $^ $(HDF5_LDFLAGS) $(HDF5_LIBS)
+ 
+ $(GALOISOBJECTS): $(GALOISHEADERS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index acfed06..e1440a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 info-dir-section.patch
 autoload-yes.patch
+hdf5-ldflags.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-communications.git



More information about the Pkg-octave-commit mailing list