[icedtea6][RFC] Fix: xalan/xerces dependencies issues in F15 build
ddadacha at redhat.com
Wed Jun 15 11:12:08 PDT 2011
Here's another fix that _shouldn't_ crash buildbot's configure with
squeeze (and hopefully nothing else). While looking into Squeeze, I
found another path for the xml jar so I added that as well.
Tested builds with
- F13-15, Squeeze with ./configure
- F15 and Squeeze with ./configure --disable-bootstrap --disable-docs
+2011-06-15 Danesh Dadachanji <ddadacha at redhat.com>
+ * AUTHORS: Added myself.
+ * Makefile.am: Use explicit xml-commons locations if necessary.
+ * acinclude.m4: Added explicit xml-commons check.
+ (IT_CHECK_IF_INSTANTIABLE): Added generic macro to instantiate any
+ class. Paramaters are the define, name of the class, paramaters
+ for instatiation and (optional) classpath.
+ * configure.ac: Invoke IT_FIND_XML_COMMONS_APIS_JAR macro after
+ IT_FIND_XERCES2_JAR, assigns XML_COMMONS_APIS_JAR if necessary.
I've just removed the AM_CONDITIONAL line from the old patch. This
conditional was not used anywhere, the only reason it was there was
because the macro I copied had it and I wanted to keep consistency. In
the future if anyone were in need of such a conditional, they can simply
make it after the call to the macro by checking the *_FOUND var. I
figured it would be alright to remove it then.
Another fix for this is to call AM_CONDITIONAL in configure.ac at a line
that is always reached. This is what the autoconf documentation says. It
should be declared before use to keep it from complaining..missed that
when I was reading up on it :S
I couldn't reproduce the error on my copy of Squeeze either so I just
removed it completely to be safe.
On 07/06/11 04:11 PM, Danesh Dadachanji wrote:
> Here is a fix for the xalan/xerces dependencies problem with building in
> F15. It checks if the xml jar is needed and then symlinks accordingly.
> I've tested it on F13-15 and it worked fine.
> +2011-07-06 Danesh Dadachanji <ddadacha at redhat.com>
> + * Makefile.am: Use explicit xml-commons locations if necessary.
> + * acinclude.m4: Added explicit xml-commons check.
> + (IT_CHECK_IF_INSTANTIABLE): Added generic macro to instantiate any
> + class. Paramaters are the define, name of the class, paramaters
> + for instatiation and (optional) classpath.
> + * configure.ac: Invoke IT_FIND_XML_COMMONS_APIS_JAR macro after
> + IT_FIND_XERCES2_JAR, assigns XML_COMMONS_APIS_JAR if necessary.
> I added a macro similar to IT_CHECK_FOR_CLASS called
> IT_CHECK_IF_INSTANTIABLE that instantiates the second paramater and
> assigns $1_INSTANTIABLE=yes if no exceptions occur, no otherwise. This
> is in addition to the AM_CONDITIONAL being set (as in the original
> macro). It also takes in an optional classpath paramater.
> - I couldn't use the existing one because class.toString() wasn't enough
> to throw the same exception as in the build. You have to instantiate
> org.apache.xerces.dom.DeferredDocumentImpl in order to do this.
> - I needed the classpath paramater because I had to explicitly specify
> the xalan/xerces jars, the other macro only checks the current dir.
> - The conditional created is also not accessible in configure.ac so I
> had to create the dummy $1_INSTANTIABLE var to do the check there. The
> conditional can only be accessed in Makefile.am, whcih can't access the
> function that finds the path of xml-commons. Hence putting the checks
> there isn't easy either.
> - I could only find the Fedora/Gentoo-specific paths to where the
> xml-commons jar is located. Does anyone know others?
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 4852 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110615/02d0d09c/Makefile-xalan-deps-updated.patch
More information about the distro-pkg-dev