openadk.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. diff -Nur icedtea-2.3.4.orig/Makefile.in icedtea-2.3.4/Makefile.in
  2. --- icedtea-2.3.4.orig/Makefile.in 2013-01-15 10:44:02.000000000 +0100
  3. +++ icedtea-2.3.4/Makefile.in 2013-02-11 17:32:45.000000000 +0100
  4. @@ -640,7 +640,7 @@
  5. $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
  6. # Bootstrapping patches
  7. -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
  8. +ICEDTEA_BOOT_PATCHES = patches/topdir-openwrt.patch patches/boot/javafiles.patch \
  9. patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
  10. patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
  11. patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \
  12. @@ -2033,7 +2033,7 @@
  13. # Optional native ecj
  14. stamps/native-ecj.stamp:
  15. mkdir -p stamps
  16. -@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
  17. +@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} -lgcj $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
  18. @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
  19. touch $@
  20. diff -Nur icedtea-2.3.4.orig/patches/topdir-openwrt.patch icedtea-2.3.4/patches/topdir-openwrt.patch
  21. --- icedtea-2.3.4.orig/patches/topdir-openwrt.patch 1970-01-01 01:00:00.000000000 +0100
  22. +++ icedtea-2.3.4/patches/topdir-openwrt.patch 2013-02-12 09:37:29.000000000 +0100
  23. @@ -0,0 +1,14 @@
  24. +diff -Nur openjdk-boot.orig/Makefile icedtea7-forest-2-3-8bd8e70d4a03.2/Makefile
  25. +--- openjdk-boot.orig/Makefile 2013-01-14 23:24:55.000000000 +0100
  26. ++++ openjdk-boot/Makefile 2013-02-11 17:28:22.000000000 +0100
  27. +@@ -53,9 +53,7 @@
  28. + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
  29. + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
  30. +
  31. +-ifndef TOPDIR
  32. +- TOPDIR:=.
  33. +-endif
  34. ++TOPDIR:=.
  35. +
  36. + ifndef JDK_TOPDIR
  37. + JDK_TOPDIR=$(TOPDIR)/jdk