[packages/scm] - updated to 5f4, slib 3c1

[qboosh]

commit ee0727432235975b23acef3a5d3d61ba49a371c4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Feb 22 06:26:47 2024 +0100

    - updated to 5f4, slib 3c1

 scm-make.patch | 43 +++++++++++++++++++++++++++++--------------
 scm.spec       | 10 +++++-----
 x32.patch      | 14 +++++++++++---
 3 files changed, 45 insertions(+), 22 deletions(-)
---
diff --git a/scm.spec b/scm.spec
index 6d7dd34..dae4173 100644
--- a/scm.spec
+++ b/scm.spec
@@ -1,15 +1,15 @@
-%define	slib_ver	3b6
+%define	slib_ver	3c1
 Summary:	Scheme implementation
 Summary(pl.UTF-8):	Implementacja Scheme
 Name:		scm
-Version:	5f3
-Release:	2
+Version:	5f4
+Release:	1
 License:	LGPL v3+
 Group:		Development/Languages/Scheme
 Source0:	http://groups.csail.mit.edu/mac/ftpdir/scm/%{name}-%{version}.zip
-# Source0-md5:	706f2da2585256ea0d78d502bef5a9e8
+# Source0-md5:	d16a55cb8f4c3e56e66d34a0eae908f3
 Source1:	http://groups.csail.mit.edu/mac/ftpdir/scm/slib-%{slib_ver}.tar.gz
-# Source1-md5:	c895d74d769c5072c4c6d1b1700db83f
+# Source1-md5:	dec6dddb3a966e5be609848c8d08b57b
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-install.patch
 Patch3:		x32.patch
diff --git a/scm-make.patch b/scm-make.patch
index 1654b49..392826d 100644
--- a/scm-make.patch
+++ b/scm-make.patch
@@ -1,6 +1,6 @@
---- scm/Makefile.orig	2016-07-29 17:01:47.090099218 +0200
-+++ scm/Makefile	2016-07-29 17:20:44.712755102 +0200
-@@ -81,7 +81,7 @@
+--- scm/Makefile.orig	2024-02-21 22:02:48.673693936 +0100
++++ scm/Makefile	2024-02-21 22:05:47.916056230 +0100
+@@ -81,7 +81,7 @@ x11incdir=/usr/include/
  
  # directory where COPYING and InitXXX.scm reside.
  #IMPLPATH = `pwd`/
@@ -9,38 +9,53 @@
  include patchlvl.h
  IMPLINIT = $(IMPLPATH)Init$(VERSION).scm
  
-@@ -390,6 +390,7 @@
+@@ -345,6 +345,7 @@ scm:	$(SCMLIT)
  scm4.opt:
- 	echo "-F cautious bignums arrays inexact" >> scm4.opt
+ 	echo "-F cautious bignums arrays inexact" > scm4.opt
  	echo "-F engineering-notation dynamic-linking" >> scm4.opt
 +	echo "--compiler-options=\"$(CFLAGS)\"" >> scm4.opt
  #	if type gcc; then echo "--compiler-options=\"-fno-guess-branch-probability\"" >> scm4.opt; fi
  scm4:	$(cfiles) $(hfiles) build.scm build scm4.opt
  	$(BUILD) -f scm4.opt -o scm -s $(IMPLPATH)
-@@ -401,6 +402,7 @@
- 	echo "-F cautious bignums arrays inexact" >> scm5.opt
+@@ -356,7 +357,7 @@ scm5.opt:
+ 	echo "-F cautious bignums arrays inexact" > scm5.opt
  	echo "-F engineering-notation dynamic-linking" >> scm5.opt
  	echo "-F macro" >> scm5.opt
+-	echo "--compiler-options=\"-O1\"" >> scm5.opt
 +	echo "--compiler-options=\"$(CFLAGS)\"" >> scm5.opt
  #	if type gcc; then echo "--compiler-options=\"-fno-guess-branch-probability\"" >> scm5.opt; fi
  scm5:	$(cfiles) $(hfiles) build.scm build scm5.opt
  	$(BUILD) -f scm5.opt -o scm -s $(IMPLPATH)
-@@ -488,6 +490,7 @@
- 	echo "-F cautious bignums arrays inexact" >> libscm.opt
+@@ -372,6 +373,7 @@ udscm4.opt:
+ 	$(MAKE) scm4.opt
+ 	cat scm4.opt > udscm4.opt
+ 	echo "-F dump" >> udscm4.opt
++	echo "--compiler-options=\"$(CFLAGS)\"" >> udscm4.opt
+ #	if type gcc; then echo "--compiler-options=\"-fno-guess-branch-probability\"" >> udscm4.opt; fi
+ udscm4:	$(cfiles) $(hfiles) build.scm build udscm4.opt
+ 	$(BUILD) -f udscm4.opt -o udscm4 -s $(IMPLPATH)
+@@ -396,6 +398,7 @@ udscm5.opt:
+ 	$(MAKE) scm5.opt
+ 	cat scm5.opt > udscm5.opt
+ 	echo "-F dump" >> udscm5.opt
++	echo "--compiler-options=\"$(CFLAGS)\"" >> udscm5.opt
+ udscm5:	$(cfiles) $(ufiles) $(hfiles) build.scm build udscm5.opt
+ 	$(BUILD) -f udscm5.opt -o udscm5 -s $(IMPLPATH)
+ 	-rm $(ofiles) scmmain.o
+@@ -444,6 +447,7 @@ libscm.opt:
+ 	echo "-F cautious bignums arrays inexact" > libscm.opt
  	echo "-F engineering-notation" >> libscm.opt
  	echo "-F dynamic-linking" >> libscm.opt
 +	echo "--compiler-options=\"$(CFLAGS)\"" >> libscm.opt
  libscm.a:	libscm.opt scm.h scmfig.h
  	$(BUILD) -t lib -f libscm.opt
  libtest:	libscm.a libtest.c
-@@ -496,8 +499,8 @@
+@@ -452,7 +456,7 @@ libtest:	libscm.a libtest.c
  
  # DLLs for dynamic linking
  dlls.opt:
--	echo "--compiler-options=-Wall" >> dlls.opt
--	echo "--linker-options=-Wall" >> dlls.opt
+-	echo "--compiler-options=-Wall" > dlls.opt
 +	echo "--compiler-options=\"-Wall $(CFLAGS)\"" >> dlls.opt
-+	echo "--linker-options=-Wall" >> dlls.opt
+ 	echo "--linker-options=-Wall" >> dlls.opt
  dlls:	dlls.opt
  	$(BUILD) -t dll -f dlls.opt -F rev2-procedures	#-c sc2.c
- 	$(BUILD) -t dll -f dlls.opt -F byte	      	#-c byte.c
diff --git a/x32.patch b/x32.patch
index 39aedaf..cbd9b1d 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,6 +1,6 @@
---- scm/scmfig.h~	2013-04-07 04:23:52.000000000 +0200
-+++ scm/scmfig.h	2015-05-10 15:47:03.372887825 +0200
-@@ -260,7 +260,7 @@
+--- scm/scmfig.h.orig	2024-02-21 21:40:25.197638836 +0100
++++ scm/scmfig.h	2024-02-21 21:49:25.254713096 +0100
+@@ -267,14 +267,14 @@ rgx.c	init_rgx();	regcomp and regexec. *
  # define SHORT_INT
  # define CDR_DOUBLES
  #endif
@@ -8,4 +8,12 @@
 +#if defined(__x86_64__) && !defined(__ILP32__)
  # define SHORT_INT
  # define CDR_DOUBLES
+ # ifdef __GNUC__                /* Includes gcc, clang, and llvm-gcc */
+ #  define SCM_LLONG __int128
+ # endif
  #endif
+-#ifdef _X86_                    /* Includes at least gcc on 32-bit platforms */
++#if defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))  /* Includes at least gcc on 32-bit platforms */
+ # ifdef __STDC_VERSION__  
+ #  if (__STDC_VERSION__ >= 199901L) /* ISO C99, has long long */
+ #   define SCM_LLONG long long
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scm.git/commitdiff/ee0727432235975b23acef3a5d3d61ba49a371c4