trunk and AOO42X should also get this fix. On 29 Oct, j...@apache.org wrote: > This is an automated email from the ASF dual-hosted git repository. > > jim pushed a commit to branch AOO418 > in repository https://gitbox.apache.org/repos/asf/openoffice.git > > > The following commit(s) were added to refs/heads/AOO418 by this push: > new 18848f5 Fix redland build issues when using CentOS5 as build and > later platforms as user. Squash General Error. > 18848f5 is described below > > commit 18848f57b67aa11f5b2c6c4b82e9d93676d1b57a > Author: Jim Jagielski <jim...@gmail.com> > AuthorDate: Thu Oct 29 07:39:50 2020 -0400 > > Fix redland build issues when using CentOS5 as build and later platforms > as user. Squash General Error. > --- > main/redland/raptor/makefile.mk | 2 +- > main/redland/rasqal/makefile.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/main/redland/raptor/makefile.mk b/main/redland/raptor/makefile.mk > index 51b7876..0c8b6a4 100644 > --- a/main/redland/raptor/makefile.mk > +++ b/main/redland/raptor/makefile.mk > @@ -128,7 +128,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for > xslt-config > CONFIGURE_DIR= > CONFIGURE_ACTION=.$/configure > # do not enable grddl parser (#i93768#) > -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --enable-parsers="rdfxml > ntriples turtle trig guess rss-tag-soup" --with-www=xml > --prefix=$(PDW)/$(OUT) --includedir=$(PWD)/$(INCCOM) --libdir=$(PWD)/$(LB) > +CONFIGURE_FLAGS=--with-threads --with-curl-config=no --with-icu-config=no > --disable-static --disable-gtk-doc --enable-parsers="rdfxml ntriples turtle > trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql > --without-postgresql --without-threestore --with-regex-library=posix > --with-decimal=none --with-www=xml --prefix=$(PDW)/$(OUT) > --includedir=$(PWD)/$(INCCOM) --libdir=$(PWD)/$(LB) > .IF "$(SYSTEM_LIBXML)" == "NO" > > CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config > \ > --with-xslt-config=${SOLARVERSION}/${INPATH}/bin/xslt-config > diff --git a/main/redland/rasqal/makefile.mk b/main/redland/rasqal/makefile.mk > index 72a4368..b95d8ca 100644 > --- a/main/redland/rasqal/makefile.mk > +++ b/main/redland/rasqal/makefile.mk > @@ -125,7 +125,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for > xslt-config > > CONFIGURE_DIR= > CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" > RASQAL_CFLAGS=-I${PWD}$/..$/${INPATH}/inc > RASQAL_LIBS="-L${PWD}/..$/${INPATH}/lib -lrasqual" > RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc > RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" > PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33" > -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc > --with-regex-library=posix --with-decimal=none > +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc > --with-regex-library=posix --with-decimal=none --with-libgcrypt-config=no > .IF "$(SYSTEM_LIBXML)" == "NO" > CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config > .ENDIF >
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
