Mercurial > hg > mxe

annotate src/hdf4-1-portability-fixes.patch @ 3032:88969381a4b5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package hdf4: expand range of host os check
author Tony Theodore <tonyt@logyst.com>
date Mon, 31 Dec 2012 02:06:40 +1100
parents ab8ac5889a4c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2881
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
1 This file is part of MXE.
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
2 See index.html for further information.
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
3
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
4 --- a/configure.ac 2012-12-02 11:01:36.252405122 +0100
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
5 +++ b/configure.ac 2012-12-02 11:00:05.580408916 +0100
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
6 @@ -556,7 +556,6 @@
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
7 dnl ======================================================================
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
8
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
9 dnl Always put the /usr/include/rpc directory first in the search list.
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
10 -CPPFLAGS="-I/usr/include/rpc $CPPFLAGS"
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
11
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
12 dnl ----------------------------------------------------------------------
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
13 dnl We're trying to link against the rpc library when building on Cygwin,
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
14 @@ -739,6 +739,7 @@
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
15 *-mac-*) BAR="mac" ;;
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
16 *-apple*) BAR="apple" ;;
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
17 i686-pc-cygwin*) BAR="linux" ;;
3032
88969381a4b5 package hdf4: expand range of host os check
Tony Theodore <tonyt@logyst.com>
parents: 2881
diff changeset
18 + *-*-mingw*) BAR="linux" ;;
2881
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
19 *) echo "*** unknown host $host!"; exit 1 ;;
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
20 esac
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
21 src_files="mfhdf/libsrc/config/netcdf-FOO.h:mfhdf/libsrc/netcdf.h
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
22 --- a.hdf/src/hdfi.h 2012-12-02 11:05:59.140394129 +0100
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
23 +++ b/hdf/src/hdfi.h 2012-12-02 11:05:32.528395313 +0100
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
24 @@ -865,8 +865,8 @@
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
25 #include <sys/stat.h>
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
26 #include <unistd.h>
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
27 #else /* !UNIX386 */
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
28 -#include <sys\types.h> /* for unbuffered file I/O */
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
29 -#include <sys\stat.h>
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
30 +#include <sys/types.h> /* for unbuffered file I/O */
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
31 +#include <sys/stat.h>
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
32 #include <io.h>
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
33 #include <conio.h> /* for debugging getch() calls */
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
34 #include <malloc.h>
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
35 --- a/mfhdf/ncgen/Makefile.am 2012-12-02 19:04:08.512697688 +0100
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
36 +++ b/mfhdf/ncgen/Makefile.am 2012-12-02 19:14:01.636713531 +0100
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
37 @@ -23,16 +23,6 @@
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
38
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
39 bin_PROGRAMS = ncgen
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
40
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
41 -if HDF_BUILD_NETCDF
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
42 -if HDF_BUILD_FORTRAN
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
43 -noinst_PROGRAMS = ctest0 ftest0
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
44 -else
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
45 -noinst_PROGRAMS = ctest0
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
46 -endif
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
47 -else
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
48 -noinst_PROGRAMS = ctest0
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
49 -endif
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
50 -
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
51 ## Information for building the "ncgen" program
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
52 ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \
ab8ac5889a4c Add package netcdf and its prerequisites hdf4, hdf5, and portablexdr.
Martin Lambers <marlam@marlam.de>
parents:
diff changeset
53 load.c main.c ncgentab.c