diff options
Diffstat (limited to 'devel/hdf/patches/patch-aj')
| -rw-r--r-- | devel/hdf/patches/patch-aj | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/devel/hdf/patches/patch-aj b/devel/hdf/patches/patch-aj index 8ca1cb14733..76401693f94 100644 --- a/devel/hdf/patches/patch-aj +++ b/devel/hdf/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.6 2004/04/20 18:14:37 drochner Exp $ +$NetBSD: patch-aj,v 1.7 2005/02/24 16:25:38 adam Exp $ ---- mfhdf/ncgen/Makefile.in.orig 2003-11-07 19:39:04.000000000 +0100 -+++ mfhdf/ncgen/Makefile.in 2004-04-20 15:53:32.000000000 +0200 -@@ -166,7 +166,7 @@ +--- mfhdf/ncgen/Makefile.in.orig 2004-12-06 23:20:34.000000000 +0000 ++++ mfhdf/ncgen/Makefile.in +@@ -169,7 +169,7 @@ ncgen_DEPENDENCIES = $(top_builddir)/hdf ############################################################################# ############################################################################# @@ -11,21 +11,48 @@ $NetBSD: patch-aj,v 1.6 2004/04/20 18:14:37 drochner Exp $ ############################################################################# -@@ -185,7 +185,7 @@ +@@ -188,7 +188,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/hdf/src/h4config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = ncgen$(EXEEXT) +bin_PROGRAMS = hdfncgen$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - am_ncgen_OBJECTS = close.$(OBJEXT) escapes.$(OBJEXT) generate.$(OBJEXT) \ -@@ -246,7 +246,7 @@ - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + @HDF_BUILD_FORTRAN_TRUE@noinst_PROGRAMS = ctest0$(EXEEXT) \ + @HDF_BUILD_FORTRAN_TRUE@ ftest0$(EXEEXT) + @HDF_BUILD_FORTRAN_FALSE@noinst_PROGRAMS = ctest0$(EXEEXT) +@@ -269,7 +269,7 @@ clean-noinstPROGRAMS: + @HDF_BUILD_FORTRAN_FALSE@ftest0$(EXEEXT): $(ftest0_OBJECTS) $(ftest0_DEPENDENCIES) + @HDF_BUILD_FORTRAN_FALSE@ @rm -f ftest0$(EXEEXT) + @HDF_BUILD_FORTRAN_FALSE@ $(LINK) $(ftest0_LDFLAGS) $(ftest0_OBJECTS) $(ftest0_LDADD) $(LIBS) -ncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES) +hdfncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES) @rm -f ncgen$(EXEEXT) $(LINK) $(ncgen_LDFLAGS) $(ncgen_OBJECTS) $(ncgen_LDADD) $(LIBS) +@@ -581,8 +581,8 @@ c-check: test2.cdl ctest0 + @HDF_BUILD_FORTRAN_TRUE@ echo "*** ncgen -f test failed (but roundoff differences are OK) ***"; \ + @HDF_BUILD_FORTRAN_TRUE@ fi + +-@HDF_BUILD_FORTRAN_TRUE@ftest0: ncgen test0.cdl netcdf.inc +-@HDF_BUILD_FORTRAN_TRUE@ ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f ++@HDF_BUILD_FORTRAN_TRUE@ftest0: hdfncgen test0.cdl netcdf.inc ++@HDF_BUILD_FORTRAN_TRUE@ ./hdfncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f + @HDF_BUILD_FORTRAN_TRUE@ $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS) + + netcdf.inc: +@@ -591,11 +591,11 @@ netcdf.inc: + test1.cdl: test0.nc + $(NCDUMP) -n test1 test0.nc > $@ + +-test0.nc: ncgen $(srcdir)/test0.cdl +- ./ncgen -b -o test0.nc $(srcdir)/test0.cdl ++test0.nc: hdfncgen $(srcdir)/test0.cdl ++ ./hdfncgen -b -o test0.nc $(srcdir)/test0.cdl + +-ctest0: ncgen $(srcdir)/test0.cdl +- ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c ++ctest0: hdfncgen $(srcdir)/test0.cdl ++ ./hdfncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c + $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS) + + ############################################################################# |