Mercurial > mxe-octave

comparison src/of-fits-1-cross-fixes.patch @ 4096:414c464563c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-fits: update to v1.0.7 * build_packages.m: update fits version * src/of-fits-1-cross-fixes.patch: update patch for cross compile 1.0.7 * src/of-fits.mk update version, checksum
author John Donoghue
date Thu, 25 Feb 2016 13:14:54 -0500
parents 85568f3159a4
children 97ad836259c3
comparison
equal deleted inserted replaced
4095:42b360982b2d 4096:414c464563c6
1 diff -ur fits.orig/src/Makefile fits/src/Makefile 1 diff -ur fits-1.0.7.orig/src/Makefile fits-1.0.7/src/Makefile
2 --- fits.orig/src/Makefile 2015-03-20 13:37:26.766478760 -0400 2 --- fits-1.0.7.orig/src/Makefile 2016-02-25 13:08:47.394452025 -0500
3 +++ fits/src/Makefile 2015-03-20 13:39:14.198586323 -0400 3 +++ fits-1.0.7/src/Makefile 2016-02-25 13:10:40.437730825 -0500
4 @@ -1,4 +1,6 @@ 4 @@ -1,4 +1,6 @@
5 -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio) 5 -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio --cflags cfitsio)
6 +MKOCTFILE ?= mkoctfile 6 +MKOCTFILE ?= mkoctfile
7 +PKG_CONFIG ?= pkg-config 7 +PKG_CONFIG ?= pkg-config
8 +MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio) 8 +MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio --cflags cfitsio)
9 9
10 all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct 10 all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
11 11
12 @@ -6,5 +8,5 @@ 12 @@ -6,5 +8,5 @@
13 rm -f *.oct *.o 13 rm -f *.oct *.o