Ticket #423: jvm9-20161122a.patch

File jvm9-20161122a.patch, 1.4 KB (added by Mark Evenson, 7 years ago)

  • build.xml 

    # HG changeset patch
# Parent  d9a47033bbbaecf0977610656ab35d4326038993
Quickly assembled patch for JVM9 compilation

With this patch, ABCL will compile with "Java(TM) SE Runtime
Environment (build 9-ea+145)" but will not load any systems via ASDF.

With JVM9, the system classloader no longer inherits from
URLClassloader, which breaks the current mechanism for locating
ABCL-CONTRIB.

diff -r d9a47033bbba build.xml
    a b  
    188188      <!-- Stock build for Java 1.5 (aka Java 2) container -->
    189189      <javac destdir="${build.classes.dir}"
    190190             debug="true"
    191              target="1.5"
    192              source="1.5"
     191             target="1.6"
     192             source="1.6"
    193193             includeantruntime="false"
    194194             failonerror="true">
    195195        <src path="${src.dir}"/>

  • src/org/armedbear/lisp/abcl-contrib.lisp 

    diff -r d9a47033bbba src/org/armedbear/lisp/abcl-contrib.lisp
    a b  
    158158                      :name (concatenate 'string
    159159                                         "abcl-contrib"
    160160                                         (subseq (pathname-name system-jar) 4)))))))
     161   #+nil ; JVM9 classloaders no longer inherit URLClassloader
    161162   (some
    162163    (lambda (u)
    163164      (probe-file (make-pathname