patch-icedtea6-1_10_Makefile_in 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.000000000 +0100
  2. +++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-04-02 23:33:17.000000000 +0200
  3. @@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow
  4. @OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
  5. @OPENJDK_SRC_DIR_FOUND_TRUE@ fi
  6. @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ if ! test -d openjdk ; then \
  7. -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPRl openjdk.hg openjdk ; \
  8. +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPR openjdk.hg openjdk ; \
  9. @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ fi
  10. @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ set -e ; \
  11. @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; \
  12. @@ -1576,7 +1576,7 @@ clean-overlay:
  13. # FIXME (missing): Rename to clone-ecj.
  14. stamps/extract-ecj.stamp: $(OPENJDK_TREE)
  15. if ! test -d openjdk-ecj ; then \
  16. - cp -pPRl openjdk openjdk-ecj ; \
  17. + cp -pPR openjdk openjdk-ecj ; \
  18. fi
  19. mkdir -p stamps
  20. touch stamps/extract-ecj.stamp
  21. @@ -1642,11 +1642,15 @@ clean-patch-ecj:
  22. # ===========================
  23. stamps/native-ecj.stamp:
  24. - mkdir -p stamps ; \
  25. - if test "x$(GCJ)" != "xno"; then \
  26. - $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
  27. - --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
  28. - fi ; \
  29. + mkdir -p stamps ; \
  30. + if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
  31. + ln -s "${ADK_ECJ}" native-ecj; \
  32. + else \
  33. + if test "x$(GCJ)" != "xno"; then \
  34. + $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
  35. + --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
  36. + fi ; \
  37. + fi; \
  38. touch stamps/native-ecj.stamp
  39. clean-native-ecj: