The package rpms/bigloo.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bigloo.git/commit/?id=1d050dcc419....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit 1d050dcc41988cabd022d378ec0870e89512d77f
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Mar 23 13:59:33 2021 -0600
Disable tests on s390x until a Java mutex problem can be diagnosed.
diff --git a/bigloo.spec b/bigloo.spec
index 302729a..15a29d3 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -287,10 +287,15 @@ cat > %{buildroot}%{_xemacs_sitestartdir}/bigloo.el <<EOF
EOF
+# FIXME: there is some kind of problem on s390x involving Java mutexes.
+# It almost looks like they are nonatomic. Disable s390x tests until we
+# can diagnose the problem.
+%ifnarch s390x
%check
ulimit -s unlimited
export TZ=$(date +%%Z)
make test
+%endif
%files
@@ -322,6 +327,7 @@ make test
- Version 4.4b
- Drop $date-is-gmt workaround
- Add -div-by-zero patch to work around test failures
+- Disable tests on s390x until a Java mutex problem can be diagnosed
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4a-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit aee88983e90983559db7c27b4a53b146df5d34d8
Author: Jerry James <loganjerry(a)gmail.com>
Date: Mon Mar 22 18:46:09 2021 -0600
Add -div-by-zero patch to work around test failures.
diff --git a/bigloo-div-by-zero.patch b/bigloo-div-by-zero.patch
new file mode 100644
index 0000000..7cea43b
--- /dev/null
+++ b/bigloo-div-by-zero.patch
@@ -0,0 +1,17 @@
+--- recette/error.scm.orig 2021-03-22 11:57:58.000000000 -0600
++++ recette/error.scm 2021-03-22 18:44:15.398794536 -0600
+@@ -307,14 +307,6 @@
+ (loop (-fx i 1)))
+ i))
+ 0)
+- (test "with-handler.11"
+- (cons
+- (bind-exit (exit)
+- (with-handler (lambda (e) (exit 'a))
+- (/fx 1 0)))
+- (with-handler (lambda (e) 'b)
+- (/fx 1 0)))
+- '(a . b))
+ (test "with-handler.1-eval"
+ (eval '(with-handler
+ (lambda (e) e)
diff --git a/bigloo.spec b/bigloo.spec
index 73359c6..302729a 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -50,6 +50,10 @@ Patch7: %{name}-javac.patch
Patch8: %{name}-return.patch
# Fix signal numbers in the Java code
Patch9: %{name}-java-signum.patch
+# GCC can sometimes replace the entire test with direct failure due to
+# detecting division by zero. Skip this test until we can figure out how
+# make GCC be a little less clever.
+Patch10: %{name}-div-by-zero.patch
BuildRequires: emacs
BuildRequires: xemacs
@@ -317,6 +321,7 @@ make test
* Fri Feb 5 2021 Jerry James <loganjerry(a)gmail.com> - 4.4b-1
- Version 4.4b
- Drop $date-is-gmt workaround
+- Add -div-by-zero patch to work around test failures
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4a-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 4e1cbad99375a1a51e0f683eee0741a5b12d9eee
Author: Jerry James <loganjerry(a)gmail.com>
Date: Mon Mar 22 14:25:03 2021 -0600
Version 4.4b. Drop $date-is-gmt workaround.
diff --git a/bigloo-java-signum.patch b/bigloo-java-signum.patch
index 3905380..5d34343 100644
--- a/bigloo-java-signum.patch
+++ b/bigloo-java-signum.patch
@@ -1,21 +1,9 @@
---- runtime/Jlib/foreign.java.orig 2020-11-17 08:34:27.658967218 -0700
-+++ runtime/Jlib/foreign.java 2020-11-17 08:37:47.902577663 -0700
-@@ -5582,21 +5582,36 @@ public final class foreign
- //////
- public static final int PTR_ALIGNMENT = 2;
- public static final int SIGHUP = 1;
-- public static final int SIGQUIT = 2;
-- public static final int SIGINT = 3;
-+ public static final int SIGINT = 2;
-+ public static final int SIGQUIT = 3;
- public static final int SIGILL = 4;
- public static final int SIGTRAP = 5;
- public static final int SIGABRT = 6;
-- public static final int SIGKILL = 9;
-- public static final int SIGFPE = 8;
+--- runtime/Jlib/foreign.java.orig 2021-03-22 13:41:14.652144132 -0600
++++ runtime/Jlib/foreign.java 2021-03-22 13:46:10.822676017 -0600
+@@ -5597,13 +5597,28 @@ public final class foreign
public static final int SIGBUS = 7;
-+ public static final int SIGFPE = 8;
-+ public static final int SIGKILL = 9;
+ public static final int SIGFPE = 8;
+ public static final int SIGKILL = 9;
+ public static final int SIGUSR1 = 10;
public static final int SIGSEGV = 11;
+ public static final int SIGUSR2 = 12;
diff --git a/bigloo-javac.patch b/bigloo-javac.patch
index 5220f65..a1d9ef9 100644
--- a/bigloo-javac.patch
+++ b/bigloo-javac.patch
@@ -1,89 +1,29 @@
---- api/pthread/src/Java/bglpthread.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ api/pthread/src/Java/bglpthread.java 2021-01-24 10:19:30.017962237 -0700
-@@ -123,7 +123,7 @@ public class bglpthread extends Thread {
-
- // Yield the processor
- public static int sched_yield() {
-- yield();
-+ Thread.yield();
- return 0;
- }
-
---- api/srfi18/src/Java/jthread.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ api/srfi18/src/Java/jthread.java 2021-01-24 10:19:59.402882259 -0700
-@@ -123,7 +123,7 @@ public class jthread extends Thread {
-
- // Yield the processor
- public static int sched_yield() {
-- yield();
-+ Thread.yield();
- return 0;
- }
-
---- api/ssl/src/Makefile.orig 2020-11-09 00:06:14.000000000 -0700
-+++ api/ssl/src/Makefile 2021-01-24 10:21:22.369671180 -0700
-@@ -90,24 +90,44 @@ INCLUDES = $(C_SRC_DIR)/bglssl.h $(C_SRC
+--- api/ssl/src/Makefile.orig 2021-03-22 11:57:58.000000000 -0600
++++ api/ssl/src/Makefile 2021-03-22 13:27:37.299383342 -0600
+@@ -192,19 +192,8 @@ jvm-extra: $(JAVA_CLASSES_SRC) $(BOOTLIB
#*---------------------------------------------------------------------*/
- #* Java objects */
+ #* Java auconfiguration */
#*---------------------------------------------------------------------*/
-+ifeq ($(JAVA_VERSION), 14)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 13)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 12)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 11)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 10)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
- ifeq ($(JAVA_VERSION), 1.9)
- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
- else
-- ifeq ($(JAVA_VERSION), 1.8)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
+-ifeq ($(JAVA_VERSION), 1.7)
+- JDK=15
+-else
+- ifeq ($(JAVA_VERSION), 1.6)
+- JDK=15
+- else
+- ifeq ($(JAVA_VERSION), 1.5)
+- JDK=15
- else
-- ifeq ($(JAVA_VERSION), 1.7)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-- else
-- ifeq ($(JAVA_VERSION), 1.6)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-- else
-- ifeq ($(JAVA_VERSION), 1.5)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-- endif
-- endif
-- endif
+- JDK=13
- endif
-+ifeq ($(JAVA_VERSION), 1.8)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 1.7)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 1.6)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 1.5)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
- endif
+- endif
+-endif
++
++JDK=15
- #*---------------------------------------------------------------------*/
---- bde/jas/produce.scm.orig 2020-11-09 00:07:31.000000000 -0700
-+++ bde/jas/produce.scm 2021-01-24 10:18:58.958050998 -0700
+ $(JAVA_SRC_DIR)/ssl_client_socket.java: \
+ $(JAVA_SRC_DIR)/ssl_client_socket$(JDK).java
+--- bde/jas/produce.scm.orig 2021-03-22 11:59:17.000000000 -0600
++++ bde/jas/produce.scm 2021-03-22 13:27:37.300383341 -0600
@@ -24,8 +24,8 @@
fields methods attributes )
(outshort outchan #xCAFE)
@@ -95,8 +35,8 @@
(produce-pool outchan pool-size (reverse pool))
(outshort outchan flags)
(outshort outchan me)
---- comptime/Jas/produce.scm.orig 2020-11-09 00:06:14.000000000 -0700
-+++ comptime/Jas/produce.scm 2021-01-24 10:18:58.959050996 -0700
+--- comptime/Jas/produce.scm.orig 2021-03-22 11:57:58.000000000 -0600
++++ comptime/Jas/produce.scm 2021-03-22 13:27:37.300383341 -0600
@@ -24,8 +24,8 @@
fields methods attributes )
(outshort outchan #xCAFE)
@@ -108,19 +48,8 @@
(produce-pool outchan pool-size (reverse pool))
(outshort outchan flags)
(outshort outchan me)
---- comptime/SawJvm/out.scm.orig 2020-11-09 00:06:14.000000000 -0700
-+++ comptime/SawJvm/out.scm 2021-01-24 10:21:57.449582777 -0700
-@@ -473,7 +473,7 @@
- (define (localvar me::jvm r b e id);
- (with-access::rtl_reg r (type var)
- (when (and (local? var) (local-user? var))
-- (let ( (user-name (symbol->string (local-id var)))
-+ (let ( (user-name (bigloo-mangle (symbol->string (local-id var))))
- (type (compile-type me type)) )
- (code! me `(localvar ,b ,e ,user-name ,type ,id)) ))))
-
---- configure.orig 2020-11-09 00:06:14.000000000 -0700
-+++ configure 2021-01-24 10:23:54.802287045 -0700
+--- configure.orig 2021-03-22 11:57:58.000000000 -0600
++++ configure 2021-03-22 13:27:39.036380709 -0600
@@ -109,7 +109,7 @@ zip=zip
jar="jar cmf"
zflags=
@@ -130,7 +59,7 @@
java=java
jflags=
jvflags=-noverify
-@@ -3255,7 +3255,7 @@ if [ $action = "all" -o $action = "biglo
+@@ -3256,7 +3256,7 @@ if [ $action = "all" -o $action = "biglo
--jflags=$jflags \
--jvflags=$jvflags \
--javac=$javac \
@@ -139,26 +68,7 @@
--cpsep="$cpsep"` || exit 1
if [ $jtest != 0 ]; then
-@@ -3266,7 +3266,17 @@ if [ $action = "all" -o $action = "biglo
- fi
-
- java_version=`$javac -version 2>&1 | head -n 1` || exit 1
-- if $echo "$java_version" | grep "1.9" > /dev/null
-+ if $echo "$java_version" | grep "14." > /dev/null
-+ then java_version=14
-+ elif $echo "$java_version" | grep "13." > /dev/null
-+ then java_version=13
-+ elif $echo "$java_version" | grep "12." > /dev/null
-+ then java_version=12
-+ elif $echo "$java_version" | grep "11." > /dev/null
-+ then java_version=11
-+ elif $echo "$java_version" | grep "10." > /dev/null
-+ then java_version=10
-+ elif $echo "$java_version" | grep "1.9" > /dev/null
- then java_version=1.9
- elif $echo "$java_version" | grep "1.8" > /dev/null
- then java_version=1.8
-@@ -4624,7 +4634,7 @@ if [ $action = "all" -o $action = "Makef
+@@ -4636,7 +4636,7 @@ if [ $action = "all" -o $action = "Makef
if [ "$java_configured" = "no" ]; then
$autoconfdir/javatest --java=$java --jflags=$jflags --jvflags=$jvflags \
@@ -167,8 +77,8 @@
if [ $? != 0 ]; then
$echo "*** ERROR:configure:Can't configure JVM back-end"
---- jigloo/jigloo.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ jigloo/jigloo.java 2021-01-24 10:18:58.961050990 -0700
+--- jigloo/jigloo.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ jigloo/jigloo.java 2021-03-22 13:27:39.037380707 -0600
@@ -21,7 +21,7 @@ public abstract class jigloo {
static PrintStream out = System.out;
static int verbose = 0;
@@ -217,16 +127,16 @@
}
---- jigloo/Makefile.orig 2020-11-09 00:06:14.000000000 -0700
-+++ jigloo/Makefile 2021-01-24 10:18:58.961050990 -0700
+--- jigloo/Makefile.orig 2021-03-22 11:57:58.000000000 -0600
++++ jigloo/Makefile 2021-03-22 13:27:39.038380706 -0600
@@ -133,4 +133,4 @@ pop:
#* .java --> .class */
#*---------------------------------------------------------------------*/
.java.class:
- @ $(JAVAC) $*.java
+ @ $(JAVAC) $(JCFLAGS) $*.java
---- runtime/Jlib/cnst.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/cnst.java 2021-01-24 10:18:58.962050987 -0700
+--- runtime/Jlib/cnst.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/cnst.java 2021-03-22 13:27:39.038380706 -0600
@@ -6,7 +6,7 @@ public class cnst extends obj
{
public final int value;
@@ -251,47 +161,8 @@
final cnst result = new cnst( value );
---- runtime/Jlib/date.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/date.java 2021-01-24 10:26:33.417887275 -0700
-@@ -21,7 +21,7 @@ public class date extends obj {
- if( !istz ) {
- calendar = new GregorianCalendar( y, mon, d, h, min, s );
- final TimeZone tmz = calendar.getTimeZone();
-- timezone = -tmz.getRawOffset() / 1000;
-+ timezone = tmz.getOffset(calendar.getTimeInMillis()) / 1000;
- } else {
- final TimeZone tmz = new SimpleTimeZone( 0, "UTC" );
- calendar = new GregorianCalendar( tmz );
-@@ -35,21 +35,21 @@ public class date extends obj {
- public date( final long seconds ) {
- calendar = new GregorianCalendar();
- final Date d = new Date();
--
-- d.setTime( seconds * 1000 );
-+ final long milliseconds = seconds * 1000;
-+ d.setTime( milliseconds );
- calendar.setTime( d );
- final TimeZone tmz = calendar.getTimeZone();
-- timezone = -tmz.getRawOffset() / 1000;
-+ timezone = tmz.getOffset( milliseconds ) / 1000;
- }
-
- public date( final long nseconds, boolean _b ) {
- calendar = new GregorianCalendar();
- final Date d = new Date();
--
-- d.setTime( nseconds / _b ? 1000000 : 1000 );
-+ final long milliseconds = nseconds / 1000000;
-+ d.setTime( milliseconds );
- calendar.setTime( d );
- final TimeZone tmz = calendar.getTimeZone();
-- timezone = -tmz.getRawOffset() / 1000;
-+ timezone = tmz.getOffset( milliseconds ) / 1000;
- nsec = _b ? (nseconds % 1000000) : (nseconds % 1000);
- }
- }
---- runtime/Jlib/dlopen.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/dlopen.java 2021-01-24 10:18:58.962050987 -0700
+--- runtime/Jlib/dlopen.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/dlopen.java 2021-03-22 13:27:39.970379293 -0600
@@ -22,7 +22,7 @@ import java.lang.reflect.*;
public abstract class dlopen {
private static final String NO_ERROR_YET = "No error (yet)";
@@ -310,41 +181,9 @@
return res;
} else {
return foreign.BUNSPEC;
---- runtime/Jlib/foreign.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/foreign.java 2021-01-24 11:44:12.623838942 -0700
-@@ -3537,17 +3537,17 @@ public final class foreign
- return new bigloo.date(ns, s, min, h, d, mon - 1, y, tz, istz, dst);
- }
-
-- public static date bgl_update_date(date, long ns, int s,
-+ public static date bgl_update_date(date dt, long ns, int s,
- int min, int h, int d, int mon,
- int y, int tz, boolean istz, int dst)
- {
- date tmp = bgl_make_date( ns, s, min, h, d, mon,
- y, tz, istz, dst);
-
-- date.nsec = tmp.nsec;
-- date.calendar = tmp.calendar;
-- date.timezone = tmp.timezone;
-- return date;
-+ dt.nsec = tmp.nsec;
-+ dt.calendar = tmp.calendar;
-+ dt.timezone = tmp.timezone;
-+ return dt;
- }
-
-
-@@ -3579,7 +3579,7 @@ public final class foreign
- return d;
- }
-
-- public static date bgl_milliseconds_to_date(long sec)
-+ public static date bgl_milliseconds_to_utc_date(long sec)
- {
- date d = new bigloo.date(sec * 1000000, true);
- d.calendar.setTimeZone(new SimpleTimeZone(0, "UTC"));
-@@ -5088,7 +5088,7 @@ public final class foreign
+--- runtime/Jlib/foreign.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/foreign.java 2021-03-22 13:41:14.652144132 -0600
+@@ -5095,7 +5095,7 @@ public final class foreign
throw v;
}
@@ -353,8 +192,8 @@
public static void notify_exception( Throwable e ) throws Throwable {
if( e instanceof ClassCastException ) {
---- runtime/Jlib/JDK16.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/JDK16.java 2021-01-24 10:18:58.963050984 -0700
+--- runtime/Jlib/JDK16.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/JDK16.java 2021-03-22 13:27:40.891377897 -0600
@@ -19,7 +19,7 @@ import java.lang.reflect.*;
public class JDK16 extends JDK {
@@ -364,8 +203,8 @@
return c.getDeclaredMethod( new String( m ) );
}
---- runtime/Jlib/JDK.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/JDK.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/JDK.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/JDK.java 2021-03-22 13:27:40.892377895 -0600
@@ -49,8 +49,8 @@ public abstract class JDK {
private static JDK getImpl(String classname) {
@@ -395,8 +234,8 @@
throws Exception;
public abstract Object invokeImpl(Method m) throws Exception;
---- runtime/Jlib/output_pipe_port.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/output_pipe_port.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/output_pipe_port.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/output_pipe_port.java 2021-03-22 13:27:40.892377895 -0600
@@ -42,7 +42,7 @@ public class output_pipe_port extends ou
static String[] tokenizer( byte[] s ) {
@@ -415,8 +254,8 @@
}
static String[] make_cmd( byte[] s ) {
---- runtime/Jlib/process.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/process.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/process.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/process.java 2021-03-22 13:27:40.893377894 -0600
@@ -12,6 +12,7 @@ package bigloo;
import java.io.IOException;
@@ -472,8 +311,8 @@
}
catch (InterruptedException _i)
{
---- runtime/Jlib/weakptr.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/weakptr.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/weakptr.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/weakptr.java 2021-03-22 13:27:40.894377892 -0600
@@ -4,10 +4,10 @@ import java.lang.ref.WeakReference;
@@ -496,80 +335,3 @@
}
public void write( final output_port p ) {
---- runtime/Makefile.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Makefile 2021-01-24 10:28:05.481655201 -0700
-@@ -108,30 +108,51 @@ C_CLIB = $(CLIB:%=Clib/%.c)
- #* Java objects */
- #*---------------------------------------------------------------------*/
- JDK_LIBS = JDK
-+
-+ifeq ($(JAVA_VERSION), 14)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 13)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 12)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 11)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 10)
-+ JDK_LIBS += JDK16
-+else
- ifeq ($(JAVA_VERSION), 1.9)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.8)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.7)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.6)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.5)
-- JDK_LIBS += JDK15
-- else
-- ifeq ($(JAVA_VERSION), 1.4)
-- JDK_LIBS += JDK14
-- else
-- JDK_LIBS += JDK13
-- endif
-- endif
-- endif
-- endif
-- endif
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.8)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.7)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.6)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.5)
-+ JDK_LIBS += JDK15
-+else
-+ifeq ($(JAVA_VERSION), 1.4)
-+ JDK_LIBS += JDK14
-+else
-+ JDK_LIBS += JDK13
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
- endif
-
- JLIB = foreign buffer configure stackwriter\
diff --git a/bigloo.spec b/bigloo.spec
index e6b81a0..73359c6 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -22,8 +22,8 @@
%global bundledgc 8.0.4
Name: bigloo
-Version: 4.4a
-Release: 2%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
+Version: 4.4b
+Release: 1%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
Summary: A compiler for the Scheme programming language
License: GPLv2+
@@ -154,24 +154,11 @@ sed -i 's/^extralibs="-lm -lc"/extralibs="-lgc
-lm -lc"/' configure
sed -i 's/LDOPTS=\"/&-Wl,--as-needed -lgc /' Makefile.misc
%endif
-# Defeat attempts at inserting unnecessary rpaths
-sed -ri 's/ ?-Wl,-rpath=[^"]+(")/\1/' configure
-
# Keep generated files for debuginfo
sed -i 's/fcfa-arithmetic/& -rm/' configure
sed -i 's/no-hello/& -rm/' bdb/bdb/Makefile
sed -i 's/-O2/& -rm/' cigloo/Makefile
-# The 4.4a release omits a Java definition of $date-is-gmt, leading to build
-# failure. Patching date.scm leads to bigloo attempting to regenerate the C
-# files, with bigloo, before the bigloo binary is built, leading to build
-# failure. Instead, we use sed to insert the missing definition, then
-# carefully put the timestamp back the way we found it. We don't want the C
-# files to be regenerated, because this affects Java only.
-sed -i.orig 's/method.*ISDST.*/&\n\t (method static $date-is-gmt::bool
(::date) "BGL_DATE_ISGMT")/' runtime/Llib/date.scm
-touch -r runtime/Llib/date.scm.orig runtime/Llib/date.scm
-rm runtime/Llib/date.scm.orig
-
%build
%define inplace $PWD/inplace
@@ -327,6 +314,10 @@ make test
%changelog
+* Fri Feb 5 2021 Jerry James <loganjerry(a)gmail.com> - 4.4b-1
+- Version 4.4b
+- Drop $date-is-gmt workaround
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4a-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e280560..c27d097 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bigloo-4.4a.tar.gz) =
7025dfb865a8cef182fb506accf42186df02232a3a94142f7fef5b01ecedbd5e8e48e80abc2dc0bcee215fb2bc961adde5930913ae41d557958f2403c0f9877f
+SHA512 (bigloo-4.4b.tar.gz) =
08b6fcb3cf985f9d24f4e60d32e0aa77a5be234111d19f8cdd3e3fb37989172524ea95d1b0dffb567c1b5d9e4c20dc1ae3c1591581e31cb62d5f5b85c721b381