Author: qboosh Date: Sun Feb 27 21:49:08 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.2r1
---- Files affected:
SOURCES:
hdf-opt.patch (1.1 -> 1.2) , hdf-shared.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/hdf-opt.patch
diff -u SOURCES/hdf-opt.patch:1.1 SOURCES/hdf-opt.patch:1.2
--- SOURCES/hdf-opt.patch:1.1 Sat Mar 6 13:46:13 2004
+++ SOURCES/hdf-opt.patch Sun Feb 27 22:49:03 2005
@@ -1,6 +1,6 @@
---- HDF4.2r0/config/linux-gnu.orig 2003-10-31 00:55:17.000000000 +0100
-+++ HDF4.2r0/config/linux-gnu 2004-03-06 13:27:44.060752280 +0100
-@@ -101,7 +101,7 @@
+--- HDF4.2r1/config/linux-gnu.orig 2004-12-08 00:04:44.000000000 +0100
++++ HDF4.2r1/config/linux-gnu 2005-02-27 21:30:49.561220144 +0100
+@@ -120,7 +120,7 @@
CFLAGS="$CFLAGS"
DEBUG_CFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
@@ -9,7 +9,7 @@
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
-@@ -111,7 +111,7 @@
+@@ -130,7 +130,7 @@
CFLAGS="$CFLAGS"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
@@ -18,7 +18,7 @@
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
-@@ -122,14 +122,14 @@
+@@ -141,7 +141,7 @@
g77)
FFLAGS="$FFLAGS -Wsign-compare"
DEBUG_FFLAGS="-g"
@@ -27,28 +27,12 @@
PROFILE_FFLAGS="-pg"
;;
- *)
- FFLAGS="$FFLAGS"
+@@ -149,7 +149,7 @@
+ CFLAGS="$CFLAGS -DH4_ABSOFT"
+ FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
DEBUG_FFLAGS="-g"
- PROD_FFLAGS="-O"
+ PROD_FFLAGS=""
PROFILE_FFLAGS="-pg"
- ;;
- esac
-@@ -138,14 +138,14 @@
- g++)
- CXXFLAGS="$CXXFLAGS"
- DEBUG_CXXFLAGS="-g -fverbose-asm"
-- PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
-+ PROD_CXXFLAGS="-fomit-frame-pointer"
- PROFILE_CXXFLAGS="-pg"
- ;;
-
- *)
- CXXFLAGS="$CXXFLAGS -ansi"
- DEBUG_CXXFLAGS="-g"
-- PROD_CXXFLAGS="-O"
-+ PROD_CXXFLAGS=""
- PROFILE_CXXFLAGS="-pg"
;;
esac
================================================================
Index: SOURCES/hdf-shared.patch
diff -u SOURCES/hdf-shared.patch:1.6 SOURCES/hdf-shared.patch:1.7
--- SOURCES/hdf-shared.patch:1.6 Sat Mar 6 13:37:51 2004
+++ SOURCES/hdf-shared.patch Sun Feb 27 22:49:03 2005
@@ -22,12 +22,12 @@
include_HEADERS = $(CHEADERS)
endif
---- HDF4.2r0/hdf/test/Makefile.am.orig 2003-11-07 19:38:42.000000000 +0100
-+++ HDF4.2r0/hdf/test/Makefile.am 2004-03-06 13:02:57.182792088 +0100
+--- 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 @@
mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \
- testhdf.c tree.c tszip.c tvattr.c tvset.c tvsfpack.c \
- vers.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_LDADD = ../src/libdf.la
@@ -277,8 +277,8 @@
check: test_hrepack
@srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh
---- HDF4.2r0/mfhdf/libsrc/Makefile.am.orig 2003-11-07 00:07:00.000000000
+0100
-+++ HDF4.2r0/mfhdf/libsrc/Makefile.am 2004-03-06 13:01:51.351799920 +0100
+--- 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 @@
## Library to build ##
#############################################################################
@@ -316,14 +316,15 @@
include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h
#############################################################################
-@@ -49,10 +51,10 @@
+@@ -49,11 +51,11 @@
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
+ hdftest_SOURCES = hdftest.c tszip.c temptySDSs.c tidtypes.c trank0.c \
+ tsd.c
-hdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
@@ -342,9 +343,9 @@
check: ncdump $(srcdir)/test0.cdl
../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
---- HDF4.2r0/mfhdf/ncgen/Makefile.am.orig 2003-11-07 19:39:04.000000000
+0100
-+++ HDF4.2r0/mfhdf/ncgen/Makefile.am 2004-03-06 13:08:24.349055256 +0100
-@@ -19,8 +19,8 @@
+--- 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 @@
## 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
@@ -355,6 +356,24 @@
## Recipe for building the ncgentab.c file
ncgentab.c ncgentab.h: ncgen.h ncgen.y ncgenyy.c
+@@ -89,7 +89,7 @@
+
+ ftest0: ncgen test0.cdl netcdf.inc
+ ./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 @@
+
+ ctest0: ncgen $(srcdir)/test0.cdl
+ ./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)
+
+ #############################################################################
+ ## Miscellaneous ##
--- HDF4.2r0/mfhdf/nctest/Makefile.am.orig 2003-11-07 19:39:09.000000000
+0100
+++ HDF4.2r0/mfhdf/nctest/Makefile.am 2004-03-06 13:08:38.075968448 +0100
@@ -22,8 +22,8 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/hdf-opt.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/hdf-shared.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
