changeset in /hg/icedtea: Find zero port correctly in out-of-dir...
Andrew John Hughes
gnu_andrew at member.fsf.org
Thu May 29 14:14:05 PDT 2008
changeset 1aea8ec4314e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1aea8ec4314e
description:
Find zero port correctly in out-of-dir build.
diffstat:
4 files changed, 38 insertions(+), 28 deletions(-)
.hgignore | 1 +
ChangeLog | 9 +++++++++
Makefile.am | 28 ++++++++++++++--------------
Makefile.in | 28 ++++++++++++++--------------
diffs (134 lines):
diff -r b27fcf6b288e -r 1aea8ec4314e .hgignore
--- a/.hgignore Wed May 28 14:57:48 2008 +0100
+++ b/.hgignore Thu May 29 10:00:34 2008 +0100
@@ -426,3 +426,4 @@ rt/java/io/
rt/java/io/
rt/sun/awt
generated/sun/awt/X11/generator/sizer.32.orig
+generated/java/lang/UNIXProcess.java
diff -r b27fcf6b288e -r 1aea8ec4314e ChangeLog
--- a/ChangeLog Wed May 28 14:57:48 2008 +0100
+++ b/ChangeLog Thu May 29 10:00:34 2008 +0100
@@ -1,3 +1,12 @@ 2008-05-28 Andrew John Hughes <gnu_and
+2008-05-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ports-ecj.stamp): Pick up ports file from
+ srcdir.
+ (ports.stamp): Likewise.
+ * Makefile.in: Regenerated.
+ * .hgignore: Add UNIXProcess.java
+
2008-05-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r b27fcf6b288e -r 1aea8ec4314e Makefile.am
--- a/Makefile.am Wed May 28 14:57:48 2008 +0100
+++ b/Makefile.am Thu May 29 10:00:34 2008 +0100
@@ -245,18 +245,18 @@ clean-clone:
# Link ports sources into tree
stamps/ports.stamp: stamps/clone.stamp
- for target in ports/hotspot/build/*/makefiles/* \
- ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
- ln -sf $$PWD/$$target $$link; \
+ for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
+ ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+ ln -sf $$target $$link; \
done
- ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+ ln -sf ${abs_top_builddir}/platform_zero openjdk/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf ${abs_top_builddir}/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf ${abs_top_builddir}/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports.stamp
@@ -435,18 +435,18 @@ clean-clone-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
- for target in ports/hotspot/build/*/makefiles/* \
- ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
- ln -sf $$PWD/$$target $$link; \
+ for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
+ ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
+ ln -sf $$target $$link; \
done
- ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
+ ln -sf ${abs_top_builddir}/platform_zero openjdk-ecj/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf ${abs_top_builddir}/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf ${abs_top_builddir}/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports-ecj.stamp
diff -r b27fcf6b288e -r 1aea8ec4314e Makefile.in
--- a/Makefile.in Wed May 28 14:57:48 2008 +0100
+++ b/Makefile.in Thu May 29 10:00:34 2008 +0100
@@ -839,18 +839,18 @@ clean-clone:
# Link ports sources into tree
stamps/ports.stamp: stamps/clone.stamp
- for target in ports/hotspot/build/*/makefiles/* \
- ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
- ln -sf $$PWD/$$target $$link; \
+ for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
+ ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+ ln -sf $$target $$link; \
done
- ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+ ln -sf ${abs_top_builddir}/platform_zero openjdk/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf ${abs_top_builddir}/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf ${abs_top_builddir}/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports.stamp
@@ -942,18 +942,18 @@ clean-clone-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
- for target in ports/hotspot/build/*/makefiles/* \
- ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
- ln -sf $$PWD/$$target $$link; \
+ for target in ${abs_top_srcdir}/ports/hotspot/build/*/makefiles/* \
+ ${abs_top_srcdir}/ports/hotspot/src/*/*; do \
+ link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
+ ln -sf $$target $$link; \
done
- ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
+ ln -sf ${abs_top_builddir}/platform_zero openjdk-ecj/hotspot/build/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+ ln -sf ${abs_top_builddir}/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
- ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+ ln -sf ${abs_top_builddir}/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
touch stamps/ports-ecj.stamp
More information about the distro-pkg-dev
mailing list