/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 14 08:27:56 PDT 2010
changeset 2877f76472f7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2877f76472f7
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 14 13:41:26 2010 +0100
Check that cp supports --reflink and use only if it does.
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (REFLINK): Set to --reflink=auto if
CP_SUPPORTS_REFLINK is defined. (extract-openjdk.stamp):
Replace --reflink=auto with $(REFLINK).
(generated.stamp): Likewise. (liveconnect-dist.stamp):
Likewise. (netx-dist.stamp): Likewise.
* acinclude.m4: (IT_CP_SUPPORTS_REFLINK): New macro to check
for a cp new enough to have --reflink.
* configure.ac: Invoke IT_CP_SUPPORTS_REFLINK.
changeset 7dd1a3ba46d2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7dd1a3ba46d2
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 14 16:27:40 2010 +0100
Hard link external OpenJDK source directories if possible, and check
that ${OPENJDK_SRC_DIR}/README exists.
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (REFLINK): Remove unneeded quotation.
(OPENJDK_SRC_DIR_LINK): Use reflink only if hard linking is
not possible.
* acinclude.m4: (IT_CP_SUPPORTS_REFLINK): Define once only.
(WITH_OPENJDK_SRC_DIR): Define once only. Check that
directory is valid (to the extent this is discernable by the
README being present) and whether hardlinking is possible,
defining OPENJDK_SRC_DIR_HARDLINKABLE if it is.
diffstat:
4 files changed, 89 insertions(+), 12 deletions(-)
ChangeLog | 30 ++++++++++++++++++++++++++++++
Makefile.am | 18 ++++++++++++++----
acinclude.m4 | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
configure.ac | 1 +
diffs (175 lines):
diff -r b636f1c1c06b -r 7dd1a3ba46d2 ChangeLog
--- a/ChangeLog Sat Jun 12 01:24:21 2010 +0100
+++ b/ChangeLog Mon Jun 14 16:27:40 2010 +0100
@@ -1,3 +1,33 @@ 2010-06-12 Andrew John Hughes <ahughes
+2010-06-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (REFLINK): Remove unneeded quotation.
+ (OPENJDK_SRC_DIR_LINK): Use reflink only
+ if hard linking is not possible.
+ * acinclude.m4:
+ (IT_CP_SUPPORTS_REFLINK): Define once only.
+ (WITH_OPENJDK_SRC_DIR): Define once only.
+ Check that directory is valid (to the extent
+ this is discernable by the README being present)
+ and whether hardlinking is possible, defining
+ OPENJDK_SRC_DIR_HARDLINKABLE if it is.
+
+2010-06-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (REFLINK): Set to --reflink=auto if
+ CP_SUPPORTS_REFLINK is defined.
+ (extract-openjdk.stamp): Replace --reflink=auto
+ with $(REFLINK).
+ (generated.stamp): Likewise.
+ (liveconnect-dist.stamp): Likewise.
+ (netx-dist.stamp): Likewise.
+ * acinclude.m4:
+ (IT_CP_SUPPORTS_REFLINK): New macro to check
+ for a cp new enough to have --reflink.
+ * configure.ac:
+ Invoke IT_CP_SUPPORTS_REFLINK.
+
2010-06-12 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r b636f1c1c06b -r 7dd1a3ba46d2 Makefile.am
--- a/Makefile.am Sat Jun 12 01:24:21 2010 +0100
+++ b/Makefile.am Mon Jun 14 16:27:40 2010 +0100
@@ -234,6 +234,16 @@ else
BOOTSTRAP_DIRECTORY_STAMP =
ICEDTEA_HOME = $(SYSTEM_JDK_DIR)
INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage2.stamp
+endif
+
+if CP_SUPPORTS_REFLINK
+ REFLINK = --reflink=auto
+endif
+
+if OPENJDK_SRC_DIR_HARDLINKABLE
+ OPENJDK_SRC_DIR_LINK = -l
+else
+ OPENJDK_SRC_DIR_LINK = $(REFLINK)
endif
# Target to ensure a patched OpenJDK tree containing Zero & Shark
@@ -1173,7 +1183,7 @@ clean-extract: clean-extract-openjdk cle
stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp
if OPENJDK_SRC_DIR_FOUND
- cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk
+ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk
else
set -e ; \
if ! test -d openjdk ; then \
@@ -1418,7 +1428,7 @@ stamps/generated.stamp: stamps/ports.sta
stamps/generated.stamp: stamps/ports.stamp
set -e ; \
if [ ! -e $(abs_top_builddir)/generated ]; then \
- cp -pPR --reflink=auto $(abs_top_srcdir)/generated $(abs_top_builddir); \
+ cp -pPR $(REFLINK) $(abs_top_srcdir)/generated $(abs_top_builddir); \
find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
-o -type d -exec chmod 750 '{}' ';'; \
fi
@@ -2070,7 +2080,7 @@ stamps/liveconnect-dist.stamp: stamps/li
(cd $(LIVECONNECT_CLASSES) ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $(LIVECONNECT_JAR) $(LIVECONNECT_DIR) ; \
- cp -pPR --reflink=auto $(PLUGIN_SRCDIR)/java src; \
+ cp -pPR $(REFLINK) $(PLUGIN_SRCDIR)/java src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
$(ZIP) -qr $(LIVECONNECT_SRC) ${LIVECONNECT_DIR} ) ; \
@@ -2107,7 +2117,7 @@ stamps/netx-dist.stamp: stamps/netx.stam
(cd $(NETX_CLASSES) ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $(NETX_JAR) javax/jnlp net ; \
- cp -pPR --reflink=auto $(NETX_SRCDIR) src; \
+ cp -pPR $(REFLINK) $(NETX_SRCDIR) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
$(ICEDTEA_BOOT_DIR)/bin/jar uf $(NETX_JAR) \
diff -r b636f1c1c06b -r 7dd1a3ba46d2 acinclude.m4
--- a/acinclude.m4 Sat Jun 12 01:24:21 2010 +0100
+++ b/acinclude.m4 Mon Jun 14 16:27:40 2010 +0100
@@ -234,23 +234,59 @@ AC_DEFUN([FIND_JAVA],
AC_SUBST(JAVA)
])
-AC_DEFUN([WITH_OPENJDK_SRC_DIR],
+AC_DEFUN_ONCE([IT_CP_SUPPORTS_REFLINK],
[
- AC_MSG_CHECKING(for an OpenJDK source directory)
+ AC_CACHE_CHECK([if cp supports --reflink], it_cv_reflink, [
+ touch tmp.$$
+ if cp --reflink=auto tmp.$$ tmp2.$$ >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_reflink=yes;
+ else
+ it_cv_reflink=no;
+ fi
+ rm -f tmp.$$ tmp2.$$
+ ])
+ AM_CONDITIONAL([CP_SUPPORTS_REFLINK], test x"${it_cv_reflink}" = "xyes")
+])
+
+AC_DEFUN_ONCE([WITH_OPENJDK_SRC_DIR],
+[
+ DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk
+ AC_MSG_CHECKING([for an OpenJDK source directory])
AC_ARG_WITH([openjdk-src-dir],
[AS_HELP_STRING(--with-openjdk-src-dir,specify the location of the openjdk sources)],
[
OPENJDK_SRC_DIR=${withval}
- AC_MSG_RESULT(${withval})
- conditional_with_openjdk_sources=true
+ with_external_src_dir=true
],
[
- conditional_with_openjdk_sources=false
- OPENJDK_SRC_DIR=`pwd`/openjdk
- AC_MSG_RESULT(${OPENJDK_SRC_DIR})
+ OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR}
+ with_external_src_dir=false
])
+ AC_MSG_RESULT(${OPENJDK_SRC_DIR})
AC_SUBST(OPENJDK_SRC_DIR)
- AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue)
+ if test "x${with_external_src_dir}" = "xtrue"; then
+ AC_MSG_CHECKING([if ${OPENJDK_SRC_DIR}/README exists])
+ if test -f ${OPENJDK_SRC_DIR}/README; then
+ openjdk_src_dir_valid=yes;
+ else
+ openjdk_src_dir_valid="no, resetting to ${DEFAULT_SRC_DIR}";
+ OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR}
+ with_external_src_dir=false
+ fi
+ AC_MSG_RESULT(${openjdk_src_dir_valid})
+ if test "x${openjdk_src_dir_valid}" = "xyes"; then
+ AC_MSG_CHECKING([if we can hard link rather than copy the OpenJDK source directory])
+ if cp -l ${OPENJDK_SRC_DIR}/README tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then
+ openjdk_src_dir_hardlinkable=yes;
+ else
+ openjdk_src_dir_hardlinkable=no;
+ fi
+ AC_MSG_RESULT(${openjdk_src_dir_hardlinkable})
+ rm -f tmp.$$
+ fi
+ fi
+ AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${with_external_src_dir}" = "xtrue")
+ AM_CONDITIONAL(OPENJDK_SRC_DIR_HARDLINKABLE, test "x${openjdk_src_dir_hardlinkable}" = "xyes")
])
AC_DEFUN([FIND_ECJ_JAR],
diff -r b636f1c1c06b -r 7dd1a3ba46d2 configure.ac
--- a/configure.ac Sat Jun 12 01:24:21 2010 +0100
+++ b/configure.ac Mon Jun 14 16:27:40 2010 +0100
@@ -48,6 +48,7 @@ AC_PATH_TOOL([LINUX32],[linux32])
AC_PATH_TOOL([LINUX32],[linux32])
AC_CHECK_GCC_VERSION
IT_FIND_NUMBER_OF_PROCESSORS
+IT_CP_SUPPORTS_REFLINK
AC_MSG_CHECKING([for a NetBeans installation])
AC_ARG_WITH([netbeans-home],
More information about the distro-pkg-dev
mailing list