All, Just wanted to post the patches and the portions that I hand merged. I didn't pay much attention to what I needed but I didn't select shark (yet) or cacao (unless it is default) and also the solaris patch doesn't seem appropriate. Some of these portions of the patches may have succeeded but I was on autopilot and may not have tried to rerun the patch after removing the portion that didn't work.
I can run diffs on any of these if needed - my previous experience a few months back had me patching and re-patching the same file from different patches so this version is much more streamlined. patches/icedtea-version.patch openjdk/jdk/make/common/shared/Defs.gmk openjdk/jdk/src/share/classes/sun/misc/Version.java.template **but named Version-template.java** openjdk/jdk/make/java/version/Makefile patches/icedtea-copy-plugs.patch openjdk/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/src/share/classes/java/beans/MetaData.java patches/icedtea-headers.patch openjdk/jdk/make/common/Defs.gmk openjdk/jdk/make/sun/font/Makefile openjdk/jdk/make/tools/freetypecheck/Makefile patches/icedtea-gcc-suffix.patch openjdk/corba/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk patches/icedtea-libraries.patch *** I may have over patched but some of these have to do with ZLIB *** openjdk/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/common/Program.gmk openjdk/jdk/make/java/jli/Makefile openjdk/jdk/make/java/zip/Makefile openjdk/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c patches/icedtea-shark-build.patch openjdk/jdk/make/java/redist/Makefile openjdk/make/hotspot-rules.gmk ** added both zero and shark code ** patches/hotspot/default/icedtea-shark-build.patch openjdk/hotspot/make/Makefile patches/cacao/arch.patch openjdk/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h patches/icedtea-lc_ctype.patch openjdk/jdk/src/solaris/native/java/lang/java_props_md.c patches/icedtea-linker-libs-order.patch openjdk/jdk/make/com/sun/java/pack/Makefile --tricky-- ************************************ did overlays start java build patches/boot/icedtea.patch openjdk-boot/corba/make/common/Defs.gmk Eric On Mon, Nov 16, 2009 at 7:15 PM, Kurt Miller <k...@intricatesoftware.com>wrote: > Hi Andrew, > > Andrew John Hughes wrote: > > 2009/11/17 Kurt Miller <k...@intricatesoftware.com>: > >> Andrew John Hughes wrote: > >>> I'm currently trying to build the BSD tree on linux-amd64 and am > confused by: > >>> > >>> > http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/diff/4fef42eb432c/make/common/internal/BinaryPlugs.gmk > >>> > >>> Why were these additions made? They aren't in either tl or the icedtea > forests. > >>> > >>> I spotted this because icedtea-copy-plugs.patch won't apply. I may > >>> just drop the copy-plugs patch altogether unless it's actually being > >>> used; I think it may be dead. > >> This was added to support building with binary plugs from when it > >> was required to have them. It was left in so that people still > >> building ALT_BINARY_PLUGS_PATH set would work. Enough time has > >> passed so I'm ok with removing it now if other project members > >> agree. > > > > Strangely, it's part of > > http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/4fef42eb432c > > which was added _after_ the binary plug dependency was removed. > > If you look at the full history, you will see it was there from the > beginning. When the binary plugs became optional, Greg removed it. > I wasn't aware the binary plugs were no longer required and added it > back in the update to b59. > > Regards, > -Kurt >
