r46860 - in /packages/jhdf/trunk/debian: patches/useSharedLib.diff rules

[pini at users.alioth.debian.org]

Author: pini
Date: Tue Aug 12 22:32:00 2014
New Revision: 46860

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46860
Log:
Fix path for libhdf5.settings.

Modified:
    packages/jhdf/trunk/debian/patches/useSharedLib.diff
    packages/jhdf/trunk/debian/rules

Modified: packages/jhdf/trunk/debian/patches/useSharedLib.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/patches/useSharedLib.diff?rev=46860&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/patches/useSharedLib.diff	(original)
+++ packages/jhdf/trunk/debian/patches/useSharedLib.diff	Tue Aug 12 22:32:00 2014
@@ -1,8 +1,8 @@
 Index: jhdf-2.9/native/hdf5lib/Makefile.in
 ===================================================================
---- jhdf-2.9.orig/native/hdf5lib/Makefile.in	2012-11-13 00:11:49.000000000 +0100
-+++ jhdf-2.9/native/hdf5lib/Makefile.in	2014-07-25 10:21:47.570650000 +0200
-@@ -35,7 +35,8 @@
+--- jhdf-2.9.orig/native/hdf5lib/Makefile.in
++++ jhdf-2.9/native/hdf5lib/Makefile.in
+@@ -35,7 +35,8 @@ COPT=@COPT@
  
  CFLAGS = -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2)
  
@@ -14,9 +14,9 @@
  OBJECTS =  exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5eImp.o h5fImp.o h5gImp.o h5iImp.o h5lImp.o h5oImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o
 Index: jhdf-2.9/native/hdflib/Makefile.in
 ===================================================================
---- jhdf-2.9.orig/native/hdflib/Makefile.in	2012-11-13 00:11:48.000000000 +0100
-+++ jhdf-2.9/native/hdflib/Makefile.in	2014-07-25 10:21:47.538648940 +0200
-@@ -41,7 +41,8 @@
+--- jhdf-2.9.orig/native/hdflib/Makefile.in
++++ jhdf-2.9/native/hdflib/Makefile.in
+@@ -41,7 +41,8 @@ COPT=@COPT@
  CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC)
  
  # Be sure to add -lbsd if compiling in a SYSV environment
@@ -28,9 +28,9 @@
  OBJECTS =  hdfstructsutil.o \
 Index: jhdf-2.9/configure.in
 ===================================================================
---- jhdf-2.9.orig/configure.in	2014-07-25 09:45:11.000000000 +0200
-+++ jhdf-2.9/configure.in	2014-07-25 10:22:19.839719235 +0200
-@@ -165,26 +165,7 @@
+--- jhdf-2.9.orig/configure.in
++++ jhdf-2.9/configure.in
+@@ -165,26 +165,7 @@ withval="";
  AC_SUBST(ZLIB) ZLIB=""
  AC_ARG_WITH(libz,[  --with-libz=LIB     Path to the gzip library (required if not in default path)],,)
  
@@ -58,7 +58,7 @@
  if test -n "$ZLIB"; then
    LIBS="$LIBS $ZLIB"
    HAVE_ZLIB="yes"
-@@ -200,25 +181,7 @@
+@@ -200,25 +181,7 @@ withval="";
  AC_SUBST(JPEGLIB) JPEGLIB=""
  AC_ARG_WITH(libjpeg,[  --with-libjpeg=LIB     Path to the jpeg library (required if not in default path)],,)
  
@@ -85,7 +85,7 @@
  if test -n "$JPEGLIB"; then
    LIBS="$LIBS $JPEGLIB"
    HAVE_JPEG="yes"
-@@ -274,33 +237,10 @@
+@@ -274,33 +237,10 @@ withval="";
  AC_SUBST(HDF4LIB) HDF4LIB=""
  AC_ARG_WITH(hdf4,[  --with-hdf4=LIB     Path to the hdf library (required if not in default path)],,)
  
@@ -123,7 +123,7 @@
  if test -n "$HDF4LIB"; then
    LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
    HAVE_HDF4="yes"
-@@ -370,7 +310,7 @@
+@@ -370,7 +310,7 @@ case "$withval" in
        fi
        hdf5_lib="`echo $withval |cut -f2 -d, -s`"
        if test -n "$hdf5_lib"; then
@@ -132,3 +132,25 @@
        fi
        HAVE_HDF5="yes"
    else
+@@ -379,10 +319,6 @@ case "$withval" in
+   fi
+   ;;
+ esac
+-if test -n "$HDF5LIB"; then
+-  LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
+-  HAVE_HDF5="yes"
+-fi
+ AC_MSG_RESULT([$HAVE_HDF5])
+ if test $HAVE_HDF5 = "yes"; then
+       AC_MSG_RESULT([HDF5 found: $HDF5LIB]);
+@@ -395,8 +331,8 @@ dnl  Must stop here if something is miss
+ dnl
+ if test -n "$HDF5LIB"; then
+   AC_MSG_CHECKING([dependencies for HDF5 library])
+-  DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
+-  SZP=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep szip`
++  DFL=`grep 'filters (external)' $hdf5_lib"/libhdf5.settings" | grep deflate`
++  SZP=`grep 'filters (external)' $hdf5_lib"/libhdf5.settings" | grep szip`
+   if test -n "$DFL";
+   then
+     if test "$HAVE_ZLIB" != "yes"; then

Modified: packages/jhdf/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/rules?rev=46860&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/rules	(original)
+++ packages/jhdf/trunk/debian/rules	Tue Aug 12 22:32:00 2014
@@ -11,7 +11,7 @@
 ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
   WITH_HDF5:=--with-hdf5=/usr/include/hdf5/serial,/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 else
-  WITH_HDF5:=--with-hdf5=/usr/include,/usr/lib
+  WITH_HDF5:=--with-hdf5=/usr/include,/usr/lib/$(DEB_HOST_MULTIARCH)
 endif