[DebianGIS-dev] r1655 - in packages/libhdf4/branches/4.1r4: config debian hdf/src hdf/test mfhdf/fortran mfhdf/libsrc mfhdf/ncgen release_notes
frankie at alioth.debian.org
frankie at alioth.debian.org
Sun Jun 22 19:15:47 UTC 2008
Author: frankie
Date: 2008-06-22 19:15:46 +0000 (Sun, 22 Jun 2008)
New Revision: 1655
Modified:
packages/libhdf4/branches/4.1r4/config/mh-linux
packages/libhdf4/branches/4.1r4/debian/changelog
packages/libhdf4/branches/4.1r4/debian/control
packages/libhdf4/branches/4.1r4/debian/rules
packages/libhdf4/branches/4.1r4/hdf/src/Makefile.in
packages/libhdf4/branches/4.1r4/hdf/src/hconv.h
packages/libhdf4/branches/4.1r4/hdf/src/hdfi.h
packages/libhdf4/branches/4.1r4/hdf/test/Makefile.in
packages/libhdf4/branches/4.1r4/hdf/test/fortestF.f
packages/libhdf4/branches/4.1r4/mfhdf/fortran/Makefile.in
packages/libhdf4/branches/4.1r4/mfhdf/libsrc/array.c
packages/libhdf4/branches/4.1r4/mfhdf/libsrc/cdf.c
packages/libhdf4/branches/4.1r4/mfhdf/libsrc/netcdf.h.in
packages/libhdf4/branches/4.1r4/mfhdf/libsrc/putget.c
packages/libhdf4/branches/4.1r4/mfhdf/ncgen/ncgen.l
packages/libhdf4/branches/4.1r4/release_notes/compile.txt
Log:
Major fixes: integrated past NMU and fixed x86_64 and ppc64 archs.
Modified: packages/libhdf4/branches/4.1r4/config/mh-linux
===================================================================
--- packages/libhdf4/branches/4.1r4/config/mh-linux 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/config/mh-linux 2008-06-22 19:15:46 UTC (rev 1655)
@@ -26,7 +26,7 @@
# Fortran compilier
#FC = f77
#FC = NONE
-FC = g77
+FC = gfortran
FFLAGS =
# Name of achive randomizer, usually ranlib (use 'true' if non-existant)
Modified: packages/libhdf4/branches/4.1r4/debian/changelog
===================================================================
--- packages/libhdf4/branches/4.1r4/debian/changelog 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/debian/changelog 2008-06-22 19:15:46 UTC (rev 1655)
@@ -1,3 +1,24 @@
+libhdf4 (4.1r4-22) unstable; urgency=low
+
+ * Moved libhdf4g-dev to libdevel, as by override.
+ * Integrated past NMU.
+ * Policy bumped to 3.7.3.
+ * Updated to support netcdf on modern 64 bits archs (x86_64 and PPC64).
+ (closes: #437098)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 14 Jun 2007 21:28:47 +0200
+
+libhdf4 (4.1r4-21.1) unstable; urgency=low
+
+ * Non-maintainer upload. (porter NMU).
+ * Move from g77 to gfortran, closes: #456297
+ * Remove the fix for bug #90363 which is no longer relevant
+ including the NOFORTRANINSOLIB hack.
+ * Char string fix in fortestF.f to overcome gfortran compiler problem.
+ * Thanks Colin Tuckley
+
+ -- Riku Voipio <riku.voipio at iki.fi> Tue, 19 Feb 2008 14:22:32 +0200
+
libhdf4 (4.1r4-21) unstable; urgency=low
* Introducing versioning in conflicts for libhdf4g-run.
Modified: packages/libhdf4/branches/4.1r4/debian/control
===================================================================
--- packages/libhdf4/branches/4.1r4/debian/control 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/debian/control 2008-06-22 19:15:46 UTC (rev 1655)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-depends: g77, sharutils, libjpeg62-dev, zlib1g-dev, bison, flex, groff, autotools-dev
+Build-depends: gfortran, sharutils, libjpeg62-dev, zlib1g-dev, bison, flex, groff, autotools-dev
Standards-Version: 3.7.2
Package: libhdf4g
@@ -50,7 +50,7 @@
Home page: http://www.hdfgroup.com/
Package: libhdf4g-dev
-Section: devel
+Section: libdevel
Priority: optional
Architecture: any
Depends: libhdf4g (= ${Source-Version}), libc6-dev, zlib1g-dev, libjpeg62-dev
Modified: packages/libhdf4/branches/4.1r4/debian/rules
===================================================================
--- packages/libhdf4/branches/4.1r4/debian/rules 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/debian/rules 2008-06-22 19:15:46 UTC (rev 1655)
@@ -33,12 +33,6 @@
somajor:=$(shell echo $(UPVERSION) | sed -e 's/^\([0-9]*\)\..*$$/\1/')
export somajor sominor
-# Temporary arm hack: g77 PIC is broken, so don't put fortran objects
-# in the solib, but put them in the .a.
-ifeq ($(shell dpkg --print-architecture),arm)
-export NOFORTRANINSOLIB=yes
-endif
-
build:
$(checkdir)
cat debian/copyright.in COPYING > debian/copyright
@@ -166,9 +160,8 @@
gzip -v9 debian/tmp-lib/usr/share/man/man5/*
# Docs
cp debian/copyright debian/tmp-lib/usr/share/doc/$(package)/
- cp debian/README.arm-fortran debian/tmp-lib/usr/share/doc/$(package)
cp debian/changelog debian/tmp-lib/usr/share/doc/$(package)/changelog.Debian
- gzip -9v debian/tmp-lib/usr/share/doc/$(package)/{changelog.Debian,README.arm-fortran}
+ gzip -9v debian/tmp-lib/usr/share/doc/$(package)/changelog.Debian
dpkg-shlibdeps debian/tmp-lib/usr/lib/*.so*
dpkg-gencontrol -isp -Pdebian/tmp-lib -p$(package)
chown -R root.root debian/tmp-lib
Modified: packages/libhdf4/branches/4.1r4/hdf/src/Makefile.in
===================================================================
--- packages/libhdf4/branches/4.1r4/hdf/src/Makefile.in 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/hdf/src/Makefile.in 2008-06-22 19:15:46 UTC (rev 1655)
@@ -263,12 +263,7 @@
libdf.so.$(somajor): libdf.so.$(sominor)
ln -sf $^ $@
-ifeq ($(NOFORTRANINSOLIB),)
libdf.so.$(sominor): $(COBJS:%.o=%.sho) $(FOBJS:%.o=%.sho)
-else
-libdf.so.$(sominor): $(COBJS:%.o=%.sho)
- @echo "### Temporary Debian hack: build solib without fortran"
-endif
$(CC) -shared -Wl,-soname,libdf.so.$(somajor) -o $@ $^ -lz -ljpeg -lc
nofort-libdf-inst.a: $(COBJS) $(PCOBJS)
Modified: packages/libhdf4/branches/4.1r4/hdf/src/hconv.h
===================================================================
--- packages/libhdf4/branches/4.1r4/hdf/src/hconv.h 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/hdf/src/hconv.h 2008-06-22 19:15:46 UTC (rev 1655)
@@ -63,7 +63,7 @@
/* CONSTANT DEFINITIONS */
/*****************************************************************************/
/* Generally Big-Endian machines */
-#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !defined(IA64) && !defined(__ia64__)
+#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !defined(IA64) && !defined(__ia64__) && !defined(__x86_64__)
# if !defined(UNICOS)
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
# define UI8_OUT DFKnb1b
Modified: packages/libhdf4/branches/4.1r4/hdf/src/hdfi.h
===================================================================
--- packages/libhdf4/branches/4.1r4/hdf/src/hdfi.h 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/hdf/src/hdfi.h 2008-06-22 19:15:46 UTC (rev 1655)
@@ -1546,10 +1546,9 @@
#endif /* I860 */
+/* Power PC 5 64 */
+#if defined __powerpc64__
-/* IA64 running Linux */
-#if defined IA64 || defined __ia64__
-
#ifdef GOT_MACHINE
If you get an error on this line more than one machine type has been defined.
Please check your Makefile.
@@ -1558,7 +1557,7 @@
#include <sys/file.h> /* for unbuffered i/o stuff */
#include <sys/stat.h>
-#define DF_MT DFMT_IA64
+#define DF_MT DFMT_POWERPC64
typedef void VOID;
typedef void *VOIDP;
typedef char *_fcd;
@@ -1576,7 +1575,9 @@
typedef float float32;
typedef double float64;
typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#if defined __GNUC__
#define FNAME_POST_UNDERSCORE
+#endif
#define _fcdtocp(desc) (desc)
#ifdef HAVE_FMPOOL
#define FILELIB PAGEBUFIO /* enable page buffering */
@@ -1598,12 +1599,62 @@
#define INCLUDES_ARE_ANSI
#endif
-#endif /* IA64 */
+#endif /*power PC 5 64 */
+/* Linux 64 */
+#if defined __x86_64__ && !(defined SUN) /* i.e. not SunOS on Intel */
-/* AMD64 running Linux */
-#if defined(__x86_64__)
+#ifdef GOT_MACHINE
+If you get an error on this line more than one machine type has been defined.
+Please check your Makefile.
+#endif
+#define GOT_MACHINE
+#include <sys/file.h> /* for unbuffered i/o stuff */
+#include <sys/stat.h>
+#define DF_MT DFMT_LINUX64
+typedef void VOID;
+typedef void *VOIDP;
+typedef char *_fcd;
+typedef char char8;
+typedef unsigned char uchar8;
+typedef char int8;
+typedef unsigned char uint8;
+typedef short int int16;
+typedef unsigned short int uint16;
+typedef int int32;
+typedef unsigned int uint32;
+typedef int intn;
+typedef unsigned int uintn;
+typedef int intf; /* size of INTEGERs in Fortran compiler */
+typedef float float32;
+typedef double float64;
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#define FNAME_POST_UNDERSCORE
+#define _fcdtocp(desc) (desc)
+#ifdef HAVE_FMPOOL
+#define FILELIB PAGEBUFIO /* enable page buffering */
+#else
+#define FILELIB UNIXBUFIO
+#endif
+
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
+
+/* Determine the memory manager we are going to use. Valid values are: */
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
+/* what each does */
+#define JMEMSYS MEM_ANSI
+
+#ifdef __GNUC__
+#define HAVE_STDC
+#define INCLUDES_ARE_ANSI
+#endif
+
+#endif /*Linux 64 */
+
+/* IA64 running Linux */
+#if defined IA64 || defined __ia64__
+
#ifdef GOT_MACHINE
If you get an error on this line more than one machine type has been defined.
Please check your Makefile.
@@ -1612,7 +1663,7 @@
#include <sys/file.h> /* for unbuffered i/o stuff */
#include <sys/stat.h>
-#define DF_MT DFMT_X86_64
+#define DF_MT DFMT_IA64
typedef void VOID;
typedef void *VOIDP;
typedef char *_fcd;
@@ -1652,7 +1703,7 @@
#define INCLUDES_ARE_ANSI
#endif
-#endif /* X86_64 */
+#endif /* IA64 */
#ifndef GOT_MACHINE
No machine type has been defined. Your Makefile needs to have someing like
Modified: packages/libhdf4/branches/4.1r4/hdf/test/Makefile.in
===================================================================
--- packages/libhdf4/branches/4.1r4/hdf/test/Makefile.in 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/hdf/test/Makefile.in 2008-06-22 19:15:46 UTC (rev 1655)
@@ -357,11 +357,7 @@
test -d $(TESTDIR) || mkdir $(TESTDIR)
fortestF: $(FOBJS) $(HDFLIB)/libdf.so
-ifeq ($(NOFORTRANINSOLIB),)
$(FC) $(FFLAGS) -o $@ $(FOBJS) -L$(HDFSRC) -ldf -ljpeg -lz -lm
-else
- $(FC) $(FFLAGS) -o $@ $(FOBJS) -static -L$(HDFSRC) -ldf -dynamic -ljpeg -lz -lm
-endif
fortest: $(HDFLIB)/libdf.so fortest.c $(CHDRS)
$(CC) $(ALL_CFLAGS) -o fortest fortest.c -L$(HDFSRC) -ldf -ljpeg -lz -lm
Modified: packages/libhdf4/branches/4.1r4/hdf/test/fortestF.f
===================================================================
--- packages/libhdf4/branches/4.1r4/hdf/test/fortestF.f 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/hdf/test/fortestF.f 2008-06-22 19:15:46 UTC (rev 1655)
@@ -190,7 +190,8 @@
if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then
print *, 'Unknown Command: ', cmd, param
- print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"'
+C print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"'
+ print *, 'Try one of Skip, Test, Verbosity or Cleanup'
retcode = -1
return
endif
Modified: packages/libhdf4/branches/4.1r4/mfhdf/fortran/Makefile.in
===================================================================
--- packages/libhdf4/branches/4.1r4/mfhdf/fortran/Makefile.in 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/mfhdf/fortran/Makefile.in 2008-06-22 19:15:46 UTC (rev 1655)
@@ -76,11 +76,7 @@
# ------------ General Macros for NETCDF --------------------
INCDIR = $(prefix)/include
-ifeq ($(NOFORTRANINSOLIB),)
-HDF_LIB = -L$(TOP_SRCDIR)/hdf/src -ldf
-else
HDF_LIB = -static -L$(TOP_SRCDIR)/hdf/src -ldf -dynamic
-endif
HDF_INC = $(TOP_SRCDIR)/hdf/src/
PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
Modified: packages/libhdf4/branches/4.1r4/mfhdf/libsrc/array.c
===================================================================
--- packages/libhdf4/branches/4.1r4/mfhdf/libsrc/array.c 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/mfhdf/libsrc/array.c 2008-06-22 19:15:46 UTC (rev 1655)
@@ -610,7 +610,7 @@
case NC_LONG :
#if defined _CRAYMPP
xdr_NC_fnct = xdr_short;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__ || defined __x86_64__ || defined __powerpc64__
xdr_NC_fnct = xdr_int ;
#else
xdr_NC_fnct = xdr_long ;
Modified: packages/libhdf4/branches/4.1r4/mfhdf/libsrc/cdf.c
===================================================================
--- packages/libhdf4/branches/4.1r4/mfhdf/libsrc/cdf.c 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/mfhdf/libsrc/cdf.c 2008-06-22 19:15:46 UTC (rev 1655)
@@ -3553,7 +3553,7 @@
alen /= 4 ;
#if defined _CRAYMPP
xdr_NC_fnct = xdr_short;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__ || defined __x86_64__ || defined __powerpc64__
xdr_NC_fnct = xdr_int ;
#else
xdr_NC_fnct = xdr_long ;
Modified: packages/libhdf4/branches/4.1r4/mfhdf/libsrc/netcdf.h.in
===================================================================
--- packages/libhdf4/branches/4.1r4/mfhdf/libsrc/netcdf.h.in 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/mfhdf/libsrc/netcdf.h.in 2008-06-22 19:15:46 UTC (rev 1655)
@@ -295,7 +295,7 @@
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__ || defined __x86_64__ || defined __powerpc64__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
Modified: packages/libhdf4/branches/4.1r4/mfhdf/libsrc/putget.c
===================================================================
--- packages/libhdf4/branches/4.1r4/mfhdf/libsrc/putget.c 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/mfhdf/libsrc/putget.c 2008-06-22 19:15:46 UTC (rev 1655)
@@ -582,7 +582,7 @@
case NC_LONG :
#if defined _CRAYMPP
return( xdr_short(xdrs, (nclong *)values) ) ;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__ || defined __x86_64__ || defined __powerpc64__
return( xdr_int(xdrs, (nclong *)values) ) ;
#else
return( xdr_long(xdrs, (nclong *)values) ) ;
Modified: packages/libhdf4/branches/4.1r4/mfhdf/ncgen/ncgen.l
===================================================================
--- packages/libhdf4/branches/4.1r4/mfhdf/ncgen/ncgen.l 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/mfhdf/ncgen/ncgen.l 2008-06-22 19:15:46 UTC (rev 1655)
@@ -134,7 +134,7 @@
yyerror(errstr);
}
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || defined __ia64__ || defined __x86_64__
if (dd < INT_MIN || dd > INT_MAX)
#else
#if defined (_CRAYMPP)
Modified: packages/libhdf4/branches/4.1r4/release_notes/compile.txt
===================================================================
--- packages/libhdf4/branches/4.1r4/release_notes/compile.txt 2008-06-19 08:07:43 UTC (rev 1654)
+++ packages/libhdf4/branches/4.1r4/release_notes/compile.txt 2008-06-22 19:15:46 UTC (rev 1655)
@@ -158,7 +158,7 @@
-L<path for hdf libraries> -lmfhdf -ldf -ljpeg -lz
FORTRAN:
- g77 -o <your program> <your program>.f \
+ gfortran -o <your program> <your program>.f \
-L<path for hdf libraries> -lmfhdf -ldf -ljpeg -lz
Solaris:
More information about the Pkg-grass-devel
mailing list