Mercurial > mxe-octave
view src/of-database-1-cross-fixes.patch @ 4224:9ded338051db
of-database: update to 2.4.2
* src/of-database.mk: update version, checksum
* build_packages.m: update database version
* src/of-database-1-cross-fixes.patch: update patch for doc building
| author | John D |
|---|---|
| date | Wed, 05 Oct 2016 15:39:03 -0400 |
| parents | 07a298959dc3 |
| children |
line wrap: on
line source
diff -ur database-2.4.2.orig/src/Makefile.in database-2.4.2/src/Makefile.in --- database-2.4.2.orig/src/Makefile.in 2016-10-02 15:12:37.447321334 -0400 +++ database-2.4.2/src/Makefile.in 2016-10-02 18:19:06.118462056 -0400 @@ -32,6 +32,8 @@ CXXCPP = @CXXCPP@ +BUILD_CXX ?= gcc + MKOCTFILE ?= @MKOCTFILE@ PG_CONFIG ?= @PG_CONFIG@ OCTAVE_CONFIG ?= @OCTAVE_CONFIG@ @@ -130,7 +132,7 @@ %.bin: %.cc if grep -q $(RDEFUN_DLD) $<; then echo "The string '$(RDEFUN_DLD)' must not be present in source code, but is in $<."; exit 1; fi if grep -q $(RDEFUNX_DLD) $<; then echo "The string '$(RDEFUNX_DLD)' must not be present in source code, but is in $<."; exit 1; fi - (echo "#include <stdio.h>"; echo "int main () {"; sed -e s/DEFUN_DLD/$(RDEFUN_DLD)/g -e s/DEFUNX_DLD/$(RDEFUNX_DLD)/g $< | $(CXXCPP) `$(MKOCTFILE) -p INCFLAGS` -I`$(PG_CONFIG) --includedir` -x c++ -iquote '.' -D'$(RDEFUN_DLD)(name,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' -D'$(RDEFUNX_DLD)(name,fname,gname,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' - | sed -e '/.*$(RDEFUN_DLD)/!D'; echo "}";) | $(CXX) -x c++ -D'$(RDEFUN_DLD)(name,doc)=printf("%c" #name "\n@c " #name " $<\n" doc "\n\n", 0x1D);' -o $@ - + (echo "#include <stdio.h>"; echo "int main () {"; sed -e s/DEFUN_DLD/$(RDEFUN_DLD)/g -e s/DEFUNX_DLD/$(RDEFUNX_DLD)/g $< | $(CXXCPP) `$(MKOCTFILE) -p INCFLAGS` -I`$(PG_CONFIG) --includedir` -x c++ -iquote '.' -D'$(RDEFUN_DLD)(name,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' -D'$(RDEFUNX_DLD)(name,fname,gname,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' - | sed -e '/.*$(RDEFUN_DLD)/!D'; echo "}";) | $(BUILD_CXX) -x c++ -D'$(RDEFUN_DLD)(name,doc)=printf("%c" #name "\n@c " #name " $<\n" doc "\n\n", 0x1D);' -o $@ - clean: $(RM) *.o octave-core *.oct *.cc.docstrings MFDOCSTRINGS $(INFOFILE) $(TEXIFILE) *~