Mercurial > mxe-octave
comparison src/of-fits-1-cross-fixes.patch @ 3854:85568f3159a4
binary-packages: update for cross tools
* Makefile.in: add MXE_OCTAVECONFIG and use for of-pkg building
* dist-files.mk: add of-fits-1-cross-fixes.patch, of-sockets-1-cross-fixes.patch
* src/default-octave.mk: use --enable-cross-tools not --enable-cross-mkoctfile and
install octave-config
* src/of-fits-1-cross-fixes.patch: new file
* src/of-fits.mk: enable package compile
* src/of-fl-core-1-fixes.patch: new file
* src/of-fl-core.mk: enable pkg conpile
* src/of-sockets-1-cross-fixes.patch: new file
* src/of-sockets.mk: enable pkg conpile
| author | John Donoghue |
|---|---|
| date | Fri, 20 Mar 2015 14:39:17 -0400 |
| parents | |
| children | 414c464563c6 |
comparison
equal
deleted
inserted
replaced
| 3853:58935b4de51f | 3854:85568f3159a4 |
|---|---|
| 1 diff -ur fits.orig/src/Makefile fits/src/Makefile | |
| 2 --- fits.orig/src/Makefile 2015-03-20 13:37:26.766478760 -0400 | |
| 3 +++ fits/src/Makefile 2015-03-20 13:39:14.198586323 -0400 | |
| 4 @@ -1,4 +1,6 @@ | |
| 5 -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio) | |
| 6 +MKOCTFILE ?= mkoctfile | |
| 7 +PKG_CONFIG ?= pkg-config | |
| 8 +MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio) | |
| 9 | |
| 10 all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct | |
| 11 | |
| 12 @@ -6,5 +8,5 @@ | |
| 13 rm -f *.oct *.o | |
| 14 | |
| 15 %.oct: %.cc | |
| 16 - mkoctfile --verbose -Wall $(MKOCT_FLAGS) $< | |
| 17 + $(MKOCTFILE) --verbose -Wall $(MKOCT_FLAGS) $< | |
| 18 |