Mercurial > mxe-octave
view src/bzip2-1-fixes.patch @ 5531:eae508c12529
Add build rule for build-octave (bug #49503).
* src/build-octave.mk: Add new build rule for build-octave which can be used for
cross-building binary packages that depend on Octave as a build tool.
* dist-files.mk: Add new file to list.
* index.html: Add new package to list.
* src/of-communications.mk, src/of-image.mk, src/of-mapping.mk,
src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk,
src/of-windows.mk: Add optional dependency on build-octave.
* configure.ac: Add new configure switch "--disable-system-octave" that is
needed to build the build-octave package.
* Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the
default build tools and build it only if a package explicitly depends on it.
Display warning about missing native Octave version only if necessary.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Tue, 08 Sep 2020 23:04:38 +0200 |
| parents | 6a63ec73029d |
| children |
line wrap: on
line source
diff -ur bzip2-1.0.8.orig/bzlib.h bzip2-1.0.8/bzlib.h --- bzip2-1.0.8.orig/bzlib.h 2020-01-06 13:24:42.229947041 -0500 +++ bzip2-1.0.8/bzlib.h 2020-01-06 13:27:27.946095881 -0500 @@ -75,7 +75,7 @@ #include <stdio.h> #endif -#ifdef _WIN32 +#if 0 # include <windows.h> # ifdef small /* windows.h define small to char */ @@ -116,7 +116,7 @@ BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( bz_stream *strm, int verbosity, - int small + int small_ ); BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( @@ -140,7 +140,7 @@ int* bzerror, FILE* f, int verbosity, - int small, + int small_, void* unused, int nUnused ); @@ -216,7 +216,7 @@ unsigned int* destLen, char* source, unsigned int sourceLen, - int small, + int small_, int verbosity );