Build progress on Mac OS X PowerPC

Andrew John Hughes gnu_andrew at member.fsf.org
Tue Nov 17 03:17:53 PST 2009


2009/11/17 Eric Richardson <ekrichardson at gmail.com>:
> 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.
>

Each build drop results in a similar process for the normal build;
some file will change and the patch will need to be recreated against
the new version.  This is one of the reasons why, long-term, we want
as many patches upstream as possible.  It's obviously going to happen
with BSD too as files have changed compared with the main JDK7
versions, and likewise the solution to this is to start getting the
BSD changes into the main tree.  Some files will always be different
until this happens and it's going to mean maintaining separate
patches.  So things will get easier as we both get patches upstream.

> 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
>

This is just an out-of-date BSD tree compared with JDK7.  Kelly's
patch changed the name of the template.  I didn't hit this when trying
bsd-port yesterday so it seems to be up-to-date now.  So you should be
able to use the standard version if you update your copy of the
bsd-port tree.

> patches/icedtea-copy-plugs.patch
>
> openjdk/jdk/make/common/internal/BinaryPlugs.gmk
> openjdk/jdk/src/share/classes/java/beans/MetaData.java
>

I saw this one too.  I think the entire patch may just be able to be
dropped now.

> patches/icedtea-headers.patch
>
> openjdk/jdk/make/common/Defs.gmk
> openjdk/jdk/make/sun/font/Makefile
> openjdk/jdk/make/tools/freetypecheck/Makefile
>

This is a weird one, I think the ability to set the name of the
freetype library would need to go upstream, though I've never heard of
a system calling it anything else.
We could just pass in the header location properly and not patch that part.
I don't think this is hugely essential, I know I have no problems
linking freetype with a normal OpenJDK build.

> patches/icedtea-gcc-suffix.patch
>
> openjdk/corba/make/common/shared/Compiler-gcc.gmk
> openjdk/jdk/make/common/shared/Compiler-gcc.gmk
>

Handles binaries like gcc-4.4 used by Debian.

> 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
>

Allows the system libraries to be used instead of intree ones.

> 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
>

These are likely both due to BSD changes to the Makefiles for HotSpot.

> patches/cacao/arch.patch
>
> openjdk/jdk/make/javax/sound/SoundDefs.gmk
> openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
>

Additional architecture support.

> patches/icedtea-lc_ctype.patch
>
> openjdk/jdk/src/solaris/native/java/lang/java_props_md.c
>

Seems to have been pushed upstream with little response.

> patches/icedtea-linker-libs-order.patch
>
> openjdk/jdk/make/com/sun/java/pack/Makefile --tricky--
>

No idea on this one.  It's apparently to be upstreamed --
http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches

> ************************************
> did overlays
> start java build
>
> patches/boot/icedtea.patch
>
> openjdk-boot/corba/make/common/Defs.gmk
>

Not sure about why we do this, need to look into it.

> Eric
>
> On Mon, Nov 16, 2009 at 7:15 PM, Kurt Miller <kurt at intricatesoftware.com>
> wrote:
>>
>> Hi Andrew,
>>
>> Andrew John Hughes wrote:
>> > 2009/11/17 Kurt Miller <kurt at 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
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8



More information about the bsd-port-dev mailing list