Mercurial > mxe-octave

annotate src/mingw-cfitsio-1-fixes.patch @ 5499:be0a7ce498e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update mesa to version 20.0.8 (bug #58689). * src/mesa.mk: Update version and checksum. Add build-meson to dependecies. Update build rule to use meson and ninja as the build tools. * src/mesa-1-meson.patch: Add new patch. * src/mesa-1-fixes.patch: Remove old patch for the scons rule that is no longer needed. * dist-files.mk: Update file list. * src/build-mako.mk: Depend on and use python3. * src/build-markupsafe.mk: Depend on and use python3.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Jul 2020 20:58:57 +0200
parents 97fc509bb1df
children d3d051b4515f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4142
de7c1c03561a cfitsio: update to v3.390
John Donoghue
parents: 3619
diff changeset
1 diff -ur cfitsio.orig/configure.in cfitsio/configure.in
4997
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
2 --- cfitsio.orig/configure.in 2019-03-05 10:42:18.453397421 -0500
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
3 +++ cfitsio/configure.in 2019-03-05 10:44:29.464686105 -0500
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
4 @@ -452,7 +452,7 @@
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
5 else
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
6 AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], [/opt/local/bin/curl-config])
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
7 fi
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
8 -if test "x$CURLCONFIG" != x; then
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
9 +if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone" ; then
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
10 CURL_LIB=`$CURLCONFIG --libs`
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
11 CURL_INC=`$CURLCONFIG --cflags`
97fc509bb1df cfitsio: update tp v3.45
John Donoghue
parents: 4142
diff changeset
12 # Also reject anaconda curl on Macs until further notice: