diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 19:20:06 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 23:31:30 +0200 |
| commit | 30ad101b102e4d69c9d2c55884ab975145d8c1db (patch) | |
| tree | d6ca4218d2cf0f07c442c4f51d97367faffc2a69 /external | |
| parent | 461d830ed8f664e171245b0cf9d53dc33a0f04d2 (diff) | |
tomcat: use servlet-api.jar from WORKDIR too
Change-Id: I985ee75aa6e313a5933c2b3f5c7c5b10a8b8b9f5
Diffstat (limited to 'external')
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_logging.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk index 98a77eb7ab45..785224b0c5c5 100644 --- a/external/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk @@ -9,12 +9,9 @@ $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging)) -# TODO: this should go into RepositoryExternal.mk -ifneq ($(SYSTEM_TOMCAT),YES) -$(eval $(call gb_ExternalProject_use_packages,apache_commons_logging,\ - tomcat_inc \ +$(eval $(call gb_ExternalProject_use_externals,apache_commons_logging,\ + servlet_api \ )) -endif $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\ build \ @@ -29,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(filter YES,$(SYSTEM_TOMCAT))\ ,-Dservletapi.jar=$(SERVLETAPI_JAR) \ - ,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \ + ,-Dservletapi.jar=$(call gb_UnpackedTarball_get_dir,tomcat)/servletapi/jsr154/dist/lib/servlet-api.jar \ )\ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ |