Mercurial > hg > release > icedtea6-1.12
changeset 2893:ce869b71eca1
Setup drops directory by symlinking when building zerovm.
We are not actually using the drops inside the zerovm build environment,
but they are checked. Which would lead to extra downloading.
* Makefile.am (add-zero.stamp): Setup drops directory by symlinking.
(add-zero-debug.stamp): Likewise.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Thu, 16 Aug 2012 22:13:13 +0200 |
| parents | 3f73297b2b13 |
| children | 34390e3aa8c5 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 16 22:02:19 2012 +0200 +++ b/ChangeLog Thu Aug 16 22:13:13 2012 +0200 @@ -1,3 +1,8 @@ +2012-08-16 Mark Wielaard <mark@klomp.org> + + * Makefile.am (add-zero.stamp): Setup drops directory by symlinking. + (add-zero-debug.stamp): Likewise. + 2012-08-16 Mark Wielaard <mark@klomp.org> * Makefile.am (stamps/add-nss.stamp): Only try patching the
--- a/Makefile.am Thu Aug 16 22:02:19 2012 +0200 +++ b/Makefile.am Thu Aug 16 22:13:13 2012 +0200 @@ -2198,7 +2198,8 @@ cd zerovm && \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ - $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) + $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) && \ + ln -s ../drops : # create directories which are expected by icedtea components, : # implicitly assumed to be created by the jdk build. @@ -2257,7 +2258,8 @@ cd zerovm && \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ - $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) + $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) && \ + ln -s ../drops $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET)