Mercurial > mxe-octave
changeset 4684:0a5da48ccaaf
of-dicom: fix gdcm cross detect issues, reenable dicom
* Makefile.in: add dicom to forge packages
* src/of-dicom.mk: pass cmake with toolchain to pkg build
| author | John Donoghue |
|---|---|
| date | Mon, 23 Apr 2018 17:14:43 -0400 |
| parents | ffb45d855a81 |
| children | 292f19dca20d |
| files | Makefile.in src/of-dicom.mk |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sat Apr 21 11:13:04 2018 -0400 +++ b/Makefile.in Mon Apr 23 17:14:43 2018 -0400 @@ -504,7 +504,7 @@ ## sparsersb: configure script needs many fixes for syntax ## configure script fails for cross compiling because ## it attempts to run Octave -OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim general signal communications image io statistics control geometry windows linear-algebra sockets data-smoothing fuzzy-logic-toolkit quaternion fits tsa netcdf ltfat database instrument-control generate_html nurbs strings financial stk splines dataframe lssa queueing ga odepkg interval nan ocs mapping tisean video zeromq gsl optiminterp) +OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim general signal communications image io statistics control geometry windows linear-algebra sockets data-smoothing fuzzy-logic-toolkit quaternion fits tsa netcdf ltfat database instrument-control generate_html nurbs strings financial stk splines dataframe lssa queueing ga odepkg interval nan ocs mapping tisean video zeromq gsl optiminterp dicom) # get ALL deps for all of- packages, regardless of whether building the actual forge package in the installer OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_FORGE_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))