SOURCES: hdf-link.patch, hdf-shared.patch - updated for 4.2r3
qboosh
qboosh at pld-linux.org
Wed Jun 4 22:23:42 CEST 2008
Author: qboosh Date: Wed Jun 4 20:23:42 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.2r3
---- Files affected:
SOURCES:
hdf-link.patch (1.1 -> 1.2) , hdf-shared.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/hdf-link.patch
diff -u SOURCES/hdf-link.patch:1.1 SOURCES/hdf-link.patch:1.2
--- SOURCES/hdf-link.patch:1.1 Thu Dec 14 11:08:34 2006
+++ SOURCES/hdf-link.patch Wed Jun 4 22:23:37 2008
@@ -1,9 +1,9 @@
---- HDF4.2r1/mfhdf/hdiff/Makefile.am.orig 2006-12-14 00:06:03.000000000 +0000
-+++ HDF4.2r1/mfhdf/hdiff/Makefile.am 2006-12-14 00:06:21.000000000 +0000
+--- HDF4.2r3/mfhdf/hdiff/Makefile.am.orig 2008-06-04 21:11:34.882851763 +0200
++++ HDF4.2r3/mfhdf/hdiff/Makefile.am 2008-06-04 21:27:20.684746589 +0200
@@ -20,7 +20,7 @@
hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c \
hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \
- hdiff_table.c hdiff_vs.c
+ hdiff_table.c hdiff_vs.c hdiff_dim.c
-hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ -lm
hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
================================================================
Index: SOURCES/hdf-shared.patch
diff -u SOURCES/hdf-shared.patch:1.7 SOURCES/hdf-shared.patch:1.8
--- SOURCES/hdf-shared.patch:1.7 Sun Feb 27 22:49:03 2005
+++ SOURCES/hdf-shared.patch Wed Jun 4 22:23:37 2008
@@ -1,5 +1,5 @@
---- HDF4.2r0/hdf/src/Makefile.am.orig 2003-11-07 00:04:16.000000000 +0100
-+++ HDF4.2r0/hdf/src/Makefile.am 2004-03-06 12:58:01.866686960 +0100
+--- HDF4.2r3/hdf/src/Makefile.am.orig 2006-12-06 21:51:13.000000000 +0100
++++ HDF4.2r3/hdf/src/Makefile.am 2008-06-04 19:39:45.388885271 +0200
@@ -2,7 +2,7 @@
## Library to build ##
#############################################################################
@@ -8,46 +8,51 @@
+lib_LTLIBRARIES = libdf.la
FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \
- dfr8ff.f dfsdf.c dfsdff.f dfufp2if.f dfutilf.c herrf.c hfilef.c \
-@@ -26,10 +26,10 @@
+ dfr8ff.f dfsdf.c dfsdff.f dfufp2iff.f dfutilf.c herrf.c hfilef.c \
+@@ -27,10 +27,10 @@
FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
if HDF_BUILD_FORTRAN
-libdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
+libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
- include_HEADERS = $(CHEADERS) $(FHEADERS)
+ include_HEADERS = $(CHEADERS) hproto_fortran.h $(FHEADERS)
else
-libdf_a_SOURCES = $(CSOURCES)
+libdf_la_SOURCES = $(CSOURCES)
include_HEADERS = $(CHEADERS)
endif
---- HDF4.2r1/hdf/test/Makefile.am.orig 2005-02-14 01:08:13.000000000 +0100
-+++ HDF4.2r1/hdf/test/Makefile.am 2005-02-27 21:25:42.690871528 +0100
-@@ -21,20 +21,20 @@
+--- HDF4.2r3/hdf/test/Makefile.am.orig 2007-12-13 08:39:20.000000000 +0100
++++ HDF4.2r3/hdf/test/Makefile.am 2008-06-04 19:40:41.856099802 +0200
+@@ -21,23 +21,23 @@
mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \
tdupimgs.c testhdf.c tree.c tszip.c tvattr.c tvset.c \
tvsfpack.c vers.c
-testhdf_LDADD = ../src/libdf.a
--testhdf_DEPENDENCIES = testdir ../src/libdf.a
+-testhdf_DEPENDENCIES = testdir ../src/libdf.a
+testhdf_LDADD = ../src/libdf.la
+testhdf_DEPENDENCIES = testdir ../src/libdf.la
+-buffer_LDADD = ../src/libdf.a
+-buffer_DEPENDENCIES = ../src/libdf.a
++buffer_LDADD = ../src/libdf.la
++buffer_DEPENDENCIES = ../src/libdf.la
+
if HDF_BUILD_FORTRAN
fortest_SOURCES = fortest.c
--fortest_LDADD = ../src/libdf.a
--fortest_DEPENDENCIES = testdir fortestF ../src/libdf.a
-+fortest_LDADD = ../src/libdf.la
-+fortest_DEPENDENCIES = testdir fortestF ../src/libdf.la
+-fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
+-fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
++fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
++fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
fortestF_SOURCES = forsupff.f forsupf.c fortestF.f manf.f mgrf.f slabwf.f \
t24f.f tanf.f tanfilef.f tpf.f tr8f.f tsdmmsf.f \
tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \
tvattrf.f tvsetf.f
--fortestF_LDADD = ../src/libdf.a
--fortestF_DEPENDENCIES = testdir ../src/libdf.a
-+fortestF_LDADD = ../src/libdf.la
-+fortestF_DEPENDENCIES = testdir ../src/libdf.la
+-fortestF_LDADD = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
+-fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
++fortestF_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
++fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
endif
testdir:
@@ -179,10 +184,10 @@
#############################################################################
## Testing -- Here there be dragons. ##
---- HDF4.2r0/mfhdf/fortran/Makefile.am.orig 2003-11-24 23:11:25.000000000 +0100
-+++ HDF4.2r0/mfhdf/fortran/Makefile.am 2004-03-06 13:06:25.466128208 +0100
-@@ -19,13 +19,13 @@
-
+--- HDF4.2r3/mfhdf/fortran/Makefile.am.orig 2007-09-06 23:48:49.000000000 +0200
++++ HDF4.2r3/mfhdf/fortran/Makefile.am 2008-06-04 19:41:26.934667007 +0200
+@@ -25,18 +25,18 @@
+ if HDF_BUILD_NETCDF
ftest_SOURCES = ftest.f
ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
- ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
@@ -190,6 +195,7 @@
ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
- $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+ $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ endif
hdftest_SOURCES = hdftest.f
-hdftest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
@@ -197,38 +203,31 @@
+hdftest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ tszip_SOURCES = tszip.f
+-tszip_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+-tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++tszip_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
++tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+
testdir:
-mkdir testdir
---- HDF4.2r0/mfhdf/hdfimport/Makefile.am.orig 2003-11-07 19:38:54.000000000 +0100
-+++ HDF4.2r0/mfhdf/hdfimport/Makefile.am 2004-03-06 13:06:58.422118136 +0100
-@@ -17,8 +17,8 @@
- bin_PROGRAMS = hdfimport
-
- hdfimport_SOURCES = hdfimport.c
--hdfimport_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
--hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
-+hdfimport_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-+hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
-
+--- HDF4.2r3/mfhdf/hdfimport/Makefile.am.orig 2006-10-11 21:58:16.000000000 +0200
++++ HDF4.2r3/mfhdf/hdfimport/Makefile.am 2008-06-04 19:41:57.528410445 +0200
+@@ -14,7 +14,7 @@
+ ## Libraries to link against ##
#############################################################################
- ## Testing -- Here there be dragons. ##
-@@ -28,8 +28,8 @@
- check_SCRIPTS = testutil.sh
- hdfimporttest_SOURCES = hdfimporttest.c
--hdfimporttest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
--hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
-+hdfimporttest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-+hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
-
- check: hdfimporttest
- @$(SHELL) ./testutil.sh
---- HDF4.2r0/mfhdf/hdiff/Makefile.am.orig 2003-11-20 22:54:42.000000000 +0100
-+++ HDF4.2r0/mfhdf/hdiff/Makefile.am 2004-03-06 13:07:23.991231040 +0100
+-LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
++LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+
+ #############################################################################
+ ## Programs to build ##
+--- HDF4.2r3/mfhdf/hdiff/Makefile.am.orig 2007-07-17 22:37:19.000000000 +0200
++++ HDF4.2r3/mfhdf/hdiff/Makefile.am 2008-06-04 19:42:15.165415521 +0200
@@ -20,8 +20,8 @@
hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c \
hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \
- hdiff_table.c hdiff_vs.c
+ hdiff_table.c hdiff_vs.c hdiff_dim.c
-hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
@@ -247,12 +246,12 @@
check: hdifftst
@srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh
---- HDF4.2r0/mfhdf/hrepack/Makefile.am.orig 2003-11-11 21:40:13.000000000 +0100
-+++ HDF4.2r0/mfhdf/hrepack/Makefile.am 2004-03-06 13:07:52.255934152 +0100
+--- HDF4.2r3/mfhdf/hrepack/Makefile.am.orig 2007-09-18 17:12:00.000000000 +0200
++++ HDF4.2r3/mfhdf/hrepack/Makefile.am 2008-06-04 19:42:39.786818615 +0200
@@ -22,8 +22,8 @@
- hrepack_opttable.c hrepack_pal.c hrepack_parse.c \
+ hrepack_opttable.c hrepack_parse.c \
hrepack_sds.c hrepack_sdutil.c hrepack_utils.c \
- hrepack_vg.c hrepack_vs.c
+ hrepack_vg.c hrepack_vs.c hrepack_dim.c
-hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
@@ -260,10 +259,10 @@
#############################################################################
## Testing -- Here there be dragons. ##
-@@ -43,12 +43,12 @@
+@@ -44,12 +44,12 @@
../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c \
../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c \
- ../hdiff/hdiff_vs.c
+ ../hdiff/hdiff_vs.c ../hdiff/hdiff_dim.c
-test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+test_hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
@@ -275,20 +274,21 @@
+hrepack_check_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
- check: test_hrepack
- @srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh
---- HDF4.2r1/mfhdf/libsrc/Makefile.am.orig 2005-02-10 02:33:49.000000000 +0100
-+++ HDF4.2r1/mfhdf/libsrc/Makefile.am 2005-02-27 21:28:16.903427656 +0100
-@@ -13,7 +13,7 @@
+ #############################################################################
+ ## And the cleanup ##
+--- HDF4.2r3/mfhdf/libsrc/Makefile.am.orig 2008-01-17 00:53:53.000000000 +0100
++++ HDF4.2r3/mfhdf/libsrc/Makefile.am 2008-06-04 19:43:18.953050571 +0200
+@@ -13,7 +13,8 @@
## Library to build ##
#############################################################################
-lib_LIBRARIES = libmfhdf.a
+lib_LTLIBRARIES = libmfhdf.la
++libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
## Information for building the "libmfhdf.a" library
CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c \
-@@ -25,21 +25,23 @@
+@@ -31,17 +32,17 @@
if HDF_BUILD_FORTRAN
if HDF_BUILD_XDR
@@ -310,21 +310,16 @@
endif
endif
-
-+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
-+
- include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h
-
- #############################################################################
-@@ -49,11 +51,11 @@
+@@ -59,12 +60,12 @@
check_PROGRAMS = cdftest hdftest
cdftest_SOURCES = cdftest.c
-cdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+cdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
- hdftest_SOURCES = hdftest.c tszip.c temptySDSs.c tidtypes.c trank0.c \
- tsd.c
+ hdftest_SOURCES = hdftest.c tchunk.c tcomp.c tcoordvar.c tdim.c \
+ temptySDSs.c tfile.c tidtypes.c tnetcdf.c trank0.c \
+ tsd.c tsdsprops.c tszip.c
-hdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
@@ -343,9 +338,9 @@
check: ncdump $(srcdir)/test0.cdl
../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
---- HDF4.2r1/mfhdf/ncgen/Makefile.am.orig 2004-12-07 00:20:33.000000000 +0100
-+++ HDF4.2r1/mfhdf/ncgen/Makefile.am 2005-02-27 22:03:03.191263696 +0100
-@@ -25,8 +25,8 @@
+--- HDF4.2r3/mfhdf/ncgen/Makefile.am.orig 2007-09-06 23:48:49.000000000 +0200
++++ HDF4.2r3/mfhdf/ncgen/Makefile.am 2008-06-04 19:45:27.852403668 +0200
+@@ -29,8 +29,8 @@
## Information for building the "ncgen" program
ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \
load.c main.c ncgentab.c
@@ -354,23 +349,23 @@
+ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
- ## Recipe for building the ncgentab.c file
- ncgentab.c ncgentab.h: ncgen.h ncgen.y ncgenyy.c
-@@ -89,7 +89,7 @@
+ ctest0_SOURCES=
+ ftest0_SOURCES=
+@@ -102,7 +102,7 @@
- ftest0: ncgen test0.cdl netcdf.inc
- ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
+ ftest0$(EXEEXT): ncgen test0.cdl netcdf.inc
+ $(TESTS_ENVIRONMENT) ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
- $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
+ $(LIBTOOL) --mode=link --tag=F77 $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
endif
- netcdf.inc:
-@@ -103,7 +103,7 @@
+ endif
+@@ -118,7 +118,7 @@
- ctest0: ncgen $(srcdir)/test0.cdl
- ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
+ ctest0$(EXEEXT): ncgen $(srcdir)/test0.cdl
+ $(TESTS_ENVIRONMENT) ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
- $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
-+ $(LINK) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
++ $(LIBTOOL) --mode=link --tag=CC $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
#############################################################################
## Miscellaneous ##
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hdf-link.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hdf-shared.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list