On Wed, Dec 13, 2017 at 09:20:57AM +0100, Rene Engelhard wrote:
> So maybe the solution is to remove that --disable-report-builder, but that
> also would mean to add the gazillion of Java packages it needs back to
> Build-Depends:
That would be basically
diff --git a/rules b/rules
index 7a4ef1b7..0d1fb805 100755
--- a/rules
+++ b/rules
@@ -1129,9 +1129,9 @@ export JAVA_HOME
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += ,
libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
- CONFIGURE_FLAGS_INDEP +=
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
+ CONFIGURE_FLAGS +=
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
endif
- BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
+ BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
else
CONFIGURE_FLAGS += --disable-report-builder
endif
@@ -1978,7 +1978,7 @@ $(STAMP_DIR)/build-arch:
COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS)
COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) --without-junit --without-cppunit \
--without-doxygen --without-javadoc
--disable-ext-wiki-publisher \
- --disable-report-builder --disable-scripting-javascript \
+ --disable-scripting-javascript \
--disable-scripting-beanshell \
--with-galleries=no --with-theme="$(DEFAULT_IMAGE)"
@@ -2049,7 +2049,7 @@ endif
COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS)
COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) \
--without-doxygen --without-javadoc
--disable-ext-wiki-publisher \
- --disable-report-builder --disable-scripting-javascript \
+ --disable-scripting-javascript \
--disable-scripting-beanshell \
--with-galleries=no --with-theme="$(DEFAULT_IMAGE)
and regenerating control...
Regards,
Rene
