diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-26 20:17:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-26 21:39:18 +0200 |
| commit | a60427ef5a9861123ffbb78fca769d3b56473af4 (patch) | |
| tree | c278c9c3e869089eced1db5db73db54f9460f249 /external/jfreereport | |
| parent | fcfdefa13f282b9b67a1f22fbed3559e44264ab9 (diff) | |
swext: fix wiki-publisher / apache-commons build
gb_Extension_use_package is inherently broken because it creates cyclic
dependencies with gb_Extension_add_file. Fortunately it's not necessary
because the added file is a target by virtue of being in the Package.
There is another cyclic dependency that can be avoided by not using the
Package in gb_ExternalProject__use_commons-logging.
Change-Id: Id4ddd4f78d819e47882387533a2d64693b2879ea
Diffstat (limited to 'external/jfreereport')
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 | ||||
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 5e03d95811a8..02ffbada4daf 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -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), \ - -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar)" \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ -Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \ diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index 3a9c27338d68..3a923b39ec47 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -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), \ - -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar)" \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ |