blob: 1ef7e195fffaf0194e14ec564a987845d42edc0a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
diff -Nur openjdk-6.orig/Makefile openjdk-6/Makefile
--- openjdk-6.orig/Makefile 2011-02-28 17:02:07.000000000 +0100
+++ openjdk-6/Makefile 2011-04-06 19:47:19.261818496 +0200
@@ -25,9 +25,7 @@
BUILD_PARENT_DIRECTORY=.
-ifndef TOPDIR
- TOPDIR:=.
-endif
+TOPDIR:=.
ifndef JDK_TOPDIR
JDK_TOPDIR=$(TOPDIR)/jdk
diff -Nur icedtea6-1.10.orig/Makefile.in icedtea6-1.10/Makefile.in
--- icedtea6-1.10.orig/Makefile.in 2011-03-02 20:48:45.161291458 +0100
+++ icedtea6-1.10/Makefile.in 2011-04-06 20:10:40.581819545 +0200
@@ -1329,7 +1329,7 @@
@OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
@OPENJDK_SRC_DIR_FOUND_TRUE@ fi
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ if ! test -d openjdk ; then \
-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPRl openjdk.hg openjdk ; \
+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPR openjdk.hg openjdk ; \
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ fi
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ set -e ; \
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; \
@@ -1576,7 +1576,7 @@
# FIXME (missing): Rename to clone-ecj.
stamps/extract-ecj.stamp: $(OPENJDK_TREE)
if ! test -d openjdk-ecj ; then \
- cp -pPRl openjdk openjdk-ecj ; \
+ cp -pPR openjdk openjdk-ecj ; \
fi
mkdir -p stamps
touch stamps/extract-ecj.stamp
@@ -1643,10 +1643,14 @@
stamps/native-ecj.stamp:
mkdir -p stamps ; \
- if test "x$(GCJ)" != "xno"; then \
- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
- fi ; \
+ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
+ ln -s "${ADK_ECJ}" native-ecj; \
+ else \
+ if test "x$(GCJ)" != "xno"; then \
+ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
+ fi ; \
+ fi; \
touch stamps/native-ecj.stamp
clean-native-ecj:
|
