[icedtea6][RFC] Fix: xalan/xerces dependencies issues in F15 build
Deepak Bhole
dbhole at redhat.com
Mon Jun 13 13:31:07 PDT 2011
* Danesh Dadachanji <ddadacha at redhat.com> [2011-06-13 15:51]:
> Hi,
>
> On 13/06/11 11:53 AM, Deepak Bhole wrote:
> >>> ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar&& \
> >>> ln -sf $(XALAN2_SERIALIZER_JAR) \
> >>> $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar&& \
> >>> - ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
> >>> + ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar&& \
> >>> + if test -n "$(XML_COMMONS_APIS_JAR)"; \
> >>> + then \
> >>> + ln -sf $(XML_COMMONS_APIS_JAR) \
> >>> + $(ECJ_BOOT_DIR)/lib/endorsed/xml-commons-apis.jar; \
> >>> + fi
> >
> >The indentation above seems incorrect (the fi is more indented than the
> >if). Please double check.
> >
> Changed the spaces to tabs.
>
> >>> +AC_DEFUN([IT_FIND_XML_COMMONS_APIS_JAR],
> >>> +[
> >>> + AC_MSG_CHECKING([for a xml-commons-apis jar])
> ><rant>
> >"for an xml-commons-apis jar"
> ></rant>
> >
> Fixed this as well. The {xalan,xerces} messages are similar though
> so they'll have to be changed eventually.
>
Feel free to suggest a patch!
> >>> + if test -f "${withval}" ; then
> >>> + XML_COMMONS_APIS_JAR="${withval}"
> >>> + fi
> >Why -f? A link should be acceptable too.
> >
> I was following what others were doing but I've added a check for a
> symlink. Perhaps the other checks (e.g. xerces, rhino) will need
> this as well?
>
Same as above, feel free to post a patch :)
> >>> + if test -z "${XML_COMMONS_APIS_JAR}"; then
> >>> + if test -e "/usr/share/java/xml-commons-apis.jar"; then
> >>> + XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-apis.jar
> >>> + elif test -e "/usr/share/xml-commons/lib/xml-apis.jar"; then
> >>> + XML_COMMONS_APIS_JAR=/usr/share/xml-commons/lib/xml-apis.jar
> >>> + else
> >>> + AC_MSG_RESULT(no)
> >>> + fi
> >>> + fi
> >These search locations should account for Debian, Gentoo, SuSE and
> >Ubuntu at the very least.
> >
> Added specific paths for Debian, SuSE and Ubuntu. I'd done Gentoo
> already =)
>
Great!
> >>> + if test -z "${XML_COMMONS_APIS_JAR}"; then
> >>> + AC_MSG_ERROR("A xml-commons-apis jar was not found.")
> >>> + fi
> ><rant2>
> >"An xml-commons-apis jar..."
> ></rant2> :)
> >
> Same as above.
>
> Here's the new patch. I've also added myself to the AUTHORS list =)
>
Patch looks good to me. Just noticed that the date in the changelog is
incorrect btw. Should be 2011-06-13, it says 2011-07-06.
After fixing date, okay for HEAD.
Thanks!
Deepak
> Regards,
> Danesh
> >Rest looks okay to me.
> >
> >Cheers,
> >Deepak
> >
> >>> fi
> >>> AC_CONFIG_FILES([javac], [chmod +x javac])
> >>> AC_CONFIG_FILES([javap], [chmod +x javap])
> diff -r c51663f190c9 AUTHORS
> --- a/AUTHORS Fri Jun 10 22:58:13 2011 +0100
> +++ b/AUTHORS Mon Jun 13 15:15:46 2011 -0400
> @@ -8,6 +8,7 @@ Tania Bento <tbento at redhat.com>
> Deepak Bhole <dbhole at redhat.com>
> Tom Callaway <tcallawa at redhat.com>
> Pablo del Campo <pablogdc at gmail.com>
> +Danesh Dadachanji <ddadacha at redhat.com>
> Thomas Fitzsimmons <fitzsim at redhat.com>
> Matthew Flaschen <matthew.flaschen at gatech.edu>
> Michael Franz <mvfranz at gmail.com>
> diff -r c51663f190c9 ChangeLog
> --- a/ChangeLog Fri Jun 10 22:58:13 2011 +0100
> +++ b/ChangeLog Mon Jun 13 15:15:46 2011 -0400
> @@ -1,3 +1,14 @@
> +2011-07-06 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.
> +
> 2011-05-23 Andrew John Hughes <ahughes at redhat.com>
>
> * Makefile.am: Add security patches.
> diff -r c51663f190c9 Makefile.am
> --- a/Makefile.am Fri Jun 10 22:58:13 2011 +0100
> +++ b/Makefile.am Mon Jun 13 15:15:46 2011 -0400
> @@ -1283,7 +1283,12 @@ stamps/bootstrap-directory-ecj.stamp: st
> ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
> ln -sf $(XALAN2_SERIALIZER_JAR) \
> $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
> - ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
> + ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar && \
> + if test -n "$(XML_COMMONS_APIS_JAR)"; \
> + then \
> + ln -sf $(XML_COMMONS_APIS_JAR) \
> + $(ECJ_BOOT_DIR)/lib/endorsed/xml-commons-apis.jar; \
> + fi
> mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
> cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \
> ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
> diff -r c51663f190c9 acinclude.m4
> --- a/acinclude.m4 Fri Jun 10 22:58:13 2011 +0100
> +++ b/acinclude.m4 Mon Jun 13 15:15:46 2011 -0400
> @@ -725,6 +725,41 @@ AC_DEFUN([IT_FIND_XERCES2_JAR],
> AC_SUBST(XERCES2_JAR)
> ])
>
> +AC_DEFUN([IT_FIND_XML_COMMONS_APIS_JAR],
> +[
> + AC_MSG_CHECKING([for an xml-commons-apis jar])
> + AC_ARG_WITH([xml-commons-apis-jar],
> + [AS_HELP_STRING(--with-xml-commons-apis-jar,specify location of the xml-commons-apis jar)],
> + [
> + if test -f "${withval}" || test -h "${withval}" ; then
> + XML_COMMONS_APIS_JAR="${withval}"
> + fi
> + ],
> + [
> + XML_COMMONS_APIS_JAR=
> + ])
> + if test -z "${XML_COMMONS_APIS_JAR}"; then
> + if test -e "/usr/share/java/xml-commons-apis.jar"; then
> + XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-apis.jar
> + elif test -e "/usr/share/xml-commons/lib/xml-apis.jar"; then
> + XML_COMMONS_APIS_JAR=/usr/share/xml-commons/lib/xml-apis.jar
> + elif test -e "/usr/share/java/xml-apis-ext.jar"; then
> + XML_COMMONS_APIS_JAR=/usr/share/java/xml-apis-ext.jar
> + elif test -e "/usr/share/java/xml-commons-external.jar"; then
> + XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-external.jar
> + elif test -e "/usr/share/java/apache-xml-commons-apis.jar"; then
> + XML_COMMONS_APIS_JAR=/usr/share/java/apache-xml-commons-apis.jar
> + else
> + AC_MSG_RESULT(no)
> + fi
> + fi
> + if test -z "${XML_COMMONS_APIS_JAR}"; then
> + AC_MSG_ERROR("An xml-commons-apis jar was not found.")
> + fi
> + AC_MSG_RESULT(${XML_COMMONS_APIS_JAR})
> + AC_SUBST(XML_COMMONS_APIS_JAR)
> +])
> +
> AC_DEFUN([IT_FIND_RHINO_JAR],
> [
> AC_MSG_CHECKING([whether to include Javascript support via Rhino])
> @@ -1374,6 +1409,63 @@ AM_CONDITIONAL([LACKS_$1], test x"${it_c
> AC_PROVIDE([$0])dnl
> ])
>
> +dnl Generic macro to instantiate a Java class
> +dnl Takes three arguments: the name of the macro,
> +dnl the name of the class and the instantiation
> +dnl paramaters. The macro name is usually the
> +dnl name of the class with '.' replaced by '_'
> +dnl and all letters capitalised.
> +dnl Also takes optional classpath paramater.
> +dnl e.g. IT_CHECK_FOR_INSTANTIABLE_CLASS([JAVA_LANG_INTEGER],
> +dnl [java.lang.Integer],[0],[./bin])
> +AC_DEFUN([IT_CHECK_IF_INSTANTIABLE],[
> +AC_CACHE_CHECK([if $2 is instantiable], it_cv_$1, [
> +CLASS=Test.java
> +BYTECODE=$(echo $CLASS|sed 's#\.java##')
> +mkdir tmp.$$
> +cd tmp.$$
> +cat << \EOF > $CLASS
> +[/* [#]line __oline__ "configure" */
> +public class Test
> +{
> + public static void main(String[] args)
> + {
> + new $2($3);
> + }
> +}
> +]
> +EOF
> +
> +if test -z $4; then
> + WITH_CLASSPATH=.
> +else
> + WITH_CLASSPATH=$4:.
> +fi
> +
> +if $JAVAC -cp $WITH_CLASSPATH $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
> + if $JAVA -classpath $WITH_CLASSPATH $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
> + it_cv_$1=yes;
> + else
> + it_cv_$1=no;
> + fi
> +else
> + it_cv_$1=no;
> +fi
> +])
> +rm -f $CLASS *.class
> +cd ..
> +rmdir tmp.$$
> +
> +if test x"${it_cv_$1}" = "xyes"
> +then
> + $1_INSTANTIABLE=yes
> +else
> + $1_INSTANTIABLE=no
> +fi
> +AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xno")
> +AC_PROVIDE([$0])dnl
> +])
> +
> # Finds number of available processors using sysconf
> AC_DEFUN_ONCE([IT_FIND_NUMBER_OF_PROCESSORS],[
> IT_FIND_TOOL([GETCONF], [getconf])
> diff -r c51663f190c9 configure.ac
> --- a/configure.ac Fri Jun 10 22:58:13 2011 +0100
> +++ b/configure.ac Mon Jun 13 15:15:46 2011 -0400
> @@ -159,6 +159,15 @@ if test "x$enable_bootstrap" = "xyes"; t
> IT_FIND_XALAN2_JAR
> IT_FIND_XALAN2_SERIALIZER_JAR
> IT_FIND_XERCES2_JAR
> + IT_CHECK_IF_INSTANTIABLE([ORG_APACHE_XERCES_DOM_DEFERREDDOCUMENTIMPL],
> +[org.apache.xerces.dom.DeferredDocumentImpl],[],
> +[$XALAN2_JAR:$XALAN2_SERIALIZER_JAR:$XERCES2_JAR])
> + if test x"${ORG_APACHE_XERCES_DOM_DEFERREDDOCUMENTIMPL_INSTANTIABLE}" = "xno"
> + then
> + IT_FIND_XML_COMMONS_APIS_JAR
> + else
> + XML_COMMONS_APIS_JAR=
> + fi
> fi
> AC_CONFIG_FILES([javac], [chmod +x javac])
> AC_CONFIG_FILES([javap], [chmod +x javap])
More information about the distro-pkg-dev
mailing list