changeset in /hg/icedtea: Fix patches to apply against OpenJDK b26.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Sun Jun 22 12:35:01 PDT 2008
changeset 0c781f5b6de5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0c781f5b6de5
description:
Fix patches to apply against OpenJDK b26.
diffstat:
8 files changed, 730 insertions(+), 1622 deletions(-)
ChangeLog | 13
Makefile.am | 1
Makefile.in | 363 --------
configure | 6
patches/icedtea-copy-plugs.patch | 143 +--
patches/icedtea-core-build.patch | 298 ++++++-
patches/icedtea-ecj.patch | 1443 ++++++++---------------------------
patches/icedtea-sparc64-linux.patch | 85 --
diffs (truncated from 3063 to 500 lines):
diff -r 6a9207d80a39 -r 0c781f5b6de5 ChangeLog
--- a/ChangeLog Sun Jun 22 01:28:42 2008 +0100
+++ b/ChangeLog Sun Jun 22 20:30:20 2008 +0100
@@ -1,3 +1,16 @@ 2008-06-20 Gary Benson <gbenson at redhat
+2008-06-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Remove unneeded component patch.
+ * Makefile.in,
+ * configure:
+ Regenerated.
+ * patches/icedtea-copy-plugs.patch,
+ * patches/icedtea-core-build.patch,
+ * patches/icedtea-ecj.patch,
+ * patches/icedtea-sparc64-linux.patch:
+ Regenerated against OpenJDK b26.
+
2008-06-20 Gary Benson <gbenson at redhat.com>
* patches/icedtea-zero-build.patch: Correctly set CPU.
diff -r 6a9207d80a39 -r 0c781f5b6de5 Makefile.am
--- a/Makefile.am Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.am Sun Jun 22 20:30:20 2008 +0100
@@ -353,7 +353,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-no-bcopy.patch \
patches/icedtea-jscheme.patch \
patches/icedtea-dnd-updatecursor.patch \
- patches/icedtea-component.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) \
patches/icedtea-xslfix.patch \
diff -r 6a9207d80a39 -r 0c781f5b6de5 Makefile.in
--- a/Makefile.in Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.in Sun Jun 22 20:30:20 2008 +0100
@@ -251,18 +251,8 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
OPENJDK_VERSION = b26
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
-=======
-OPENJDK_DATE = 30_may_2008
-OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
-OPENJDK_VERSION = b10
JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -281,32 +271,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
-=======
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_RT = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-=======
$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_CLS_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
-=======
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_BOOT_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/bootstrap/jdk1.6.0
-=======
$(abs_top_builddir)/bootstrap/jdk1.6.0
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -318,26 +292,12 @@ JDK_UPDATE_VERSION = 0
@ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-||||||| /tmp/Makefile.in~base.9SzsA6
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -355,54 +315,24 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
-=======
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
$(am__append_2) $(am__append_3)
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
-||||||| /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
-=======
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_CLS_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
-||||||| /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
-=======
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-||||||| /tmp/Makefile.in~base.9SzsA6
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -426,27 +356,15 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
-=======
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
$(am__append_5) $(am__append_6)
# OpenJDK Source Preparation Targets
# ==================================
# Download OpenJDK sources.
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
@USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP =
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
-=======
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
@USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
@@ -468,15 +386,9 @@ ZERO_PATCHES = \
patches/icedtea-signed-types.patch \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-zero.patch \
- patches/icedtea-ia64-bugfix.patch \
- patches/icedtea-eclipse-hotspot-6614100-7b24.patch
-
-
-# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
-NON_ZERO_PATCHES = \
- patches/icedtea-eclipse-hotspot-6614100-6b06.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
+ patches/icedtea-ia64-bugfix.patch
+
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND =
@ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
patches/icedtea-version.patch \
@@ -505,40 +417,27 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
- patches/icedtea-arm-uname.patch \
+ patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-LCMS-setTagData.patch \
patches/icedtea-color-createcontext.patch \
+ patches/icedtea-color-profiles.patch \
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
- patches/icedtea-override-redirect-metacity.patch \
- $(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
- patches/icedtea-xslfix.patch patches/icedtea-override.patch \
- $(am__append_7)
-||||||| /tmp/Makefile.in~base.9SzsA6
- patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
- patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES) $(am__append_7)
-=======
- patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
+ $(ZERO_PATCHES_COND) \
+ patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
- patches/icedtea-dnd-updatecursor.patch \
- patches/icedtea-component.patch $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES) $(am__append_7)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
+ patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+ $(DISTRIBUTION_PATCHES) patches/icedtea-xslfix.patch \
+ patches/icedtea-override.patch $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
-=======
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP =
@WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP =
@@ -954,84 +853,24 @@ clean-clone:
rm -rf openjdk
# Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/ports.stamp: stamps/clone.stamp
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; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports.stamp: stamps/extract.stamp
- for target in ports/hotspot/build/*/makefiles/* \
- ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
- ln -sf $$PWD/$$target $$link; \
-=======
-stamps/ports.stamp: stamps/extract.stamp
- 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; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-=======
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- 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; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- 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; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
mkdir -p stamps
touch stamps/ports.stamp
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/patch.stamp: stamps/clone.stamp
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/extract.stamp: stamps/download.stamp
- if ! test -d openjdk ; \
- then \
- mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
- chmod -R ug+w openjdk ; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
-=======
-stamps/extract.stamp: stamps/download.stamp
- if ! test -d openjdk ; \
- then \
- mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
- chmod -R ug+w openjdk ; \
- rm -rf $(JSCHEME_DIR)/lib; \
- rm -rf $(JSCHEME_DIR)/scripts; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
all_patches_ok=yes; \
cd $(abs_top_builddir)/openjdk/jdk; \
for p in $(OPENJDK_PATCHES) ; \
@@ -1051,18 +890,10 @@ stamps/patch.stamp: stamps/extract.stamp
do \
if test x$${all_patches_ok} == "xyes" \
&& echo Checking $$p \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
-=======
&& $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
echo Applying $$p ; \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(PATCH) -l -p0 < $$p ; \
-=======
$(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
else \
test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
fi ; \
@@ -1081,7 +912,6 @@ clean-patch:
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
then \
echo Reverting $$p ; \
@@ -1095,20 +925,9 @@ clean-patch:
do \
echo Checking $$p ; \
if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
- if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
-=======
- if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
echo Reverting $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
- $(PATCH) -l -p0 -R < $$p ; \
-=======
- $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
else \
all_patches_ok=no ; \
fi ; \
@@ -1119,11 +938,7 @@ clean-patch:
fi
stamps/overlay.stamp: stamps/patch.stamp
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
-=======
cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
# OpenJDK ecj Source Preparation Targets
# ======================================
@@ -1141,45 +956,19 @@ clean-clone-ecj:
rm -rf openjdk-ecj
# Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
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; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports-ecj.stamp: stamps/extract-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; \
-=======
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
- 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; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-=======
ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- 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; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- 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; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
mkdir -p stamps
touch stamps/ports-ecj.stamp
@@ -1213,13 +1002,7 @@ clean-patch-ecj:
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
ln -s $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-||||||| /tmp/Makefile.in~base.9SzsA6
- ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-=======
- ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
if ! test -d bootstrap/icedtea/include; then \
ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
fi
@@ -1287,35 +1070,16 @@ stamps/bootstrap-directory-ecj.stamp:
--with-gcj-home=/path/to/java-gcj-devel ; \
exit 1; \
fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
-=======
if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- mkdir -p bootstrap/ecj/lib ; \
- ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
- $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
-=======
mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
$(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
- fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
-=======
+ fi
if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
More information about the distro-pkg-dev
mailing list