diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 18:40:48 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 23:31:30 +0200 |
commit | 461d830ed8f664e171245b0cf9d53dc33a0f04d2 (patch) | |
tree | 6ff4a44bbeb727a977675d1b90da2cfa890de4ef /external/jfreereport | |
parent | 15a9ef2147e2cdcc1ec5bb2f63e0154bcd5fa651 (diff) |
stop using apache-commons jars from OUTDIR too
Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1
Diffstat (limited to 'external/jfreereport')
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 4 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 08b86134cedc..d88b1c9f58e5 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -23,7 +23,9 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -q \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ + -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ -Dlib=$(OUTDIR)/bin \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index cddbef1d32ed..b7be4eda163f 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -9,11 +9,9 @@ $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout)) -ifneq ($(SYSTEM_APACHE_COMMONS),YES) -$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ - apache_commons_logging_inc \ +$(eval $(call gb_ExternalProject_use_externals,jfreereport_liblayout,\ + commons-logging \ )) -endif $(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ jfreereport_sac \ @@ -37,7 +35,9 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -q \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ + -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ |