# HG changeset patch # User John Donoghue # Date 1524518083 14400 # Node ID 0a5da48ccaafb499695f7feba7de31fa981912dc # Parent ffb45d855a8138075bca5770cbd615c35ecd466d 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 diff -r ffb45d855a81 -r 0a5da48ccaaf Makefile.in --- 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))) diff -r ffb45d855a81 -r 0a5da48ccaaf src/of-dicom.mk --- a/src/of-dicom.mk Sat Apr 21 11:13:04 2018 -0400 +++ b/src/of-dicom.mk Mon Apr 23 17:14:43 2018 -0400 @@ -26,5 +26,5 @@ endef define $(PKG)_BUILD - $(OCTAVE_FORGE_PKG_BUILD) + $(call OCTAVE_FORGE_PKG_BUILD,$(1),$(2),$(3),$($(PKG)_OPTIONS)) endef