icedtea6-Makefile_in.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132
  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. @@ -1576,7 +1576,7 @@ clean-overlay:
  4. # FIXME (missing): Rename to clone-ecj.
  5. stamps/extract-ecj.stamp: $(OPENJDK_TREE)
  6. if ! test -d openjdk-ecj ; then \
  7. - cp -pPRl openjdk openjdk-ecj ; \
  8. + cp -pPR openjdk openjdk-ecj ; \
  9. fi
  10. mkdir -p stamps
  11. touch stamps/extract-ecj.stamp
  12. @@ -1642,11 +1642,15 @@ clean-patch-ecj:
  13. # ===========================
  14. stamps/native-ecj.stamp:
  15. - mkdir -p stamps ; \
  16. - if test "x$(GCJ)" != "xno"; then \
  17. - $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
  18. - --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
  19. - fi ; \
  20. + mkdir -p stamps ; \
  21. + if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
  22. + ln -s "${ADK_ECJ}" native-ecj; \
  23. + else \
  24. + if test "x$(GCJ)" != "xno"; then \
  25. + $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
  26. + --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
  27. + fi ; \
  28. + fi; \
  29. touch stamps/native-ecj.stamp
  30. clean-native-ecj: