~ruther/guix-local

ref: b36f3b2810d96280d2a228f1aa43375becdc43cc guix-local/gnu/packages/patches/abcl-fix-build-xml.patch -rw-r--r-- 1.9 KiB
b36f3b28 — Maxim Cournoyer Revert "gnu: icedove: Build with bundled ICU library to resolve issues." 8 months ago
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
ABCL's build calls the hostname command, and needs the internet to download
JUnit. Neither of these are really required, though, so we can patch them out
to make it build.

We also remove the Implemetation-Build property that ends up in the manifest
file, because it stores information about the time of the build, which makes
it non-deterministic.

--- a/build.xml
+++ b/build.xml
@@ -338,7 +338,7 @@ from ${abcl.home.dir}
     <property name="abcl.build.path"
               value="${build.classes.dir}/org/armedbear/lisp/build"/>
     <target name="abcl.stamp" 
-            depends="abcl.compile,abcl.stamp.version,abcl.stamp.hostname">
+            depends="abcl.compile,abcl.stamp.version">
       <mkdir dir="${abcl.build.path}/.."/>
       <loadfile property="abcl.version"
                 srcFile="${abcl.version.path}"/>
@@ -479,11 +479,6 @@ Mercurial and Git.
                 value="${abcl.version}-${abcl.version.src}"/>
     </target>

-    <target name="abcl.stamp.hostname" if="unix">
-      <exec executable="hostname" outputproperty="abcl.hostname"/>
-      <echo>abcl.hostname: ${abcl.hostname}</echo>
-    </target>
-
     <target name="abcl.system.uptodate">
       <condition property="abcl.system.needs-update.p">
         <and>
@@ -524,8 +519,6 @@ Mercurial and Git.
                        value="ABCL"/>
             <attribute name="Implementation-Version"  
                        value="${abcl.version}"/>
-            <attribute name="Implementation-Build" 
-                       value="${build}"/>
           </section>
         </manifest>
         <metainf dir="${src.dir}/META-INF"> 
@@ -1050,8 +1043,7 @@ ${basedir}/../cl-bench
       </unzip>
     </target>
         
-    <target name="abcl.test.compile" 
-            depends="abcl.test.pre-compile">
+    <target name="abcl.test.compile" >
       <mkdir dir="${abcl.test.classes.dir}"/>
       <javac destdir="${abcl.test.classes.dir}"
              classpathref="abcl.test.compile.classpath"