diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
| commit | f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c (patch) | |
| tree | 50b3bae39301c2ef89bbbabdb843a62d679e034e /package/openjdk/patches/patch-icedtea6-1_10_Makefile_in | |
| parent | c2bd3a43342e37a05a97e12581dd2bd52993877a (diff) | |
I am to tupid for git, today.
Revert "Revert "fix conflict, autoseect libgcj""
This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
Diffstat (limited to 'package/openjdk/patches/patch-icedtea6-1_10_Makefile_in')
| -rw-r--r-- | package/openjdk/patches/patch-icedtea6-1_10_Makefile_in | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in new file mode 100644 index 000000000..7e19f5159 --- /dev/null +++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in @@ -0,0 +1,29 @@ +--- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.161291458 +0100 ++++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-03-28 17:00:03.591807998 +0200 +@@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow + @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 @@ clean-overlay: + # 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 +@@ -1644,7 +1644,7 @@ clean-patch-ecj: + stamps/native-ecj.stamp: + mkdir -p stamps ; \ + if test "x$(GCJ)" != "xno"; then \ +- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ ++ $(GCJ) -static $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ + --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ + fi ; \ + touch stamps/native-ecj.stamp |