From 8eacd3b2a2d39d204c45367d2d88cc12fc5a0cd5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 28 2020 04:01:10 +0000 Subject: Update to 4.3g. Use the bundled gc again for performance reasons. --- diff --git a/bigloo-format.patch b/bigloo-format.patch index 0be8b35..a3b29c4 100644 --- a/bigloo-format.patch +++ b/bigloo-format.patch @@ -1,5 +1,5 @@ ---- api/avahi/src/Clib/bglavahi.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/avahi/src/Clib/bglavahi.c 2019-07-04 11:56:22.826166771 -0600 +--- api/avahi/src/Clib/bglavahi.c.orig 2020-02-26 23:59:16.000000000 -0700 ++++ api/avahi/src/Clib/bglavahi.c 2020-02-27 19:33:22.061218185 -0700 @@ -482,7 +482,7 @@ AvahiStringList * bgl_avahi_list_to_string_list( obj_t p ) { // MS: 28 feb 2017 @@ -9,25 +9,9 @@ while( PAIRP( p ) ) { l = avahi_string_list_add( l, BSTRING_TO_STRING( CAR( p ) ) ); ---- bde/bmem/lib/alloc.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ bde/bmem/lib/alloc.c 2019-07-04 13:49:40.481341508 -0600 -@@ -33,11 +33,11 @@ unsigned long ante_bgl_init_dsz = 0; - { long __idx = bmem_thread ? \ - (long)____pthread_getspecific( bmem_key3 ) \ - : alloc_index; \ -- ((__idx < 0 || __idx >= 5) ? (fprintf( stderr, "*** bmem: stack overflow/underflow \"%s\" [%d]\n", name, __idx ), exit( -2 )) : 0) -+ ((__idx < 0 || __idx >= 5) ? (fprintf( stderr, "*** bmem: stack overflow/underflow \"%s\" [%ld]\n", name, __idx ), exit( -2 )) : 0) - - #define DBG_INDEX_STOP( name ) \ - (bmem_thread ? (long)____pthread_getspecific( bmem_key3 ) : alloc_index) != (__idx -1) \ -- ? fprintf( stderr, "*** bmem: illegal stack after \"%s\" [%d/%d]\n", name, (bmem_thread ? (long)____pthread_getspecific( bmem_key3 ) : alloc_index), __idx - 1), exit( -1 ) : 0; } 0 -+ ? fprintf( stderr, "*** bmem: illegal stack after \"%s\" [%ld/%ld]\n", name, (bmem_thread ? (long)____pthread_getspecific( bmem_key3 ) : alloc_index), __idx - 1), exit( -1 ) : 0; } 0 - - /*---------------------------------------------------------------------*/ - /* char * */ ---- comptime/Cc/exec.c.orig 2019-07-04 00:10:26.000000000 -0600 -+++ comptime/Cc/exec.c 2019-07-04 11:56:22.827166770 -0600 -@@ -342,7 +342,7 @@ extern "C" +--- comptime/Cc/exec.c.orig 2020-02-26 23:59:58.000000000 -0700 ++++ comptime/Cc/exec.c 2020-02-27 19:33:24.872209877 -0700 +@@ -332,7 +332,7 @@ extern "C" BSTRING_TO_STRING(BGl_za2shellza2z00zzengine_paramz00); BgL_arg1031z00_37 = execl(BgL_tmpz00_118, BgL_auxz00_120, BgL_auxz00_122, diff --git a/bigloo-params.patch b/bigloo-params.patch index ff1488b..7bd5af0 100644 --- a/bigloo-params.patch +++ b/bigloo-params.patch @@ -1,5 +1,5 @@ ---- runtime/Clib/callcc.c.orig 2019-07-04 12:00:22.002011080 -0600 -+++ runtime/Clib/callcc.c 2019-07-04 12:01:21.294968359 -0600 +--- runtime/Clib/callcc.c.orig 2020-02-26 23:59:17.000000000 -0700 ++++ runtime/Clib/callcc.c 2020-02-27 19:35:09.357901072 -0700 @@ -27,7 +27,7 @@ extern long glob_dummy; extern obj_t make_fx_procedure( obj_t (*)(), int, int ); extern obj_t c_constant_string_to_string( char * ); @@ -9,8 +9,8 @@ extern obj_t unwind_stack_until( obj_t, obj_t, obj_t, obj_t ); extern bool_t unwind_stack_value_p( obj_t ); extern void *bgl_get_top_of_stack(); ---- runtime/Clib/cerror.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ runtime/Clib/cerror.c 2019-07-04 12:00:22.003011079 -0600 +--- runtime/Clib/cerror.c.orig 2020-02-26 23:59:17.000000000 -0700 ++++ runtime/Clib/cerror.c 2020-02-27 19:35:09.358901069 -0700 @@ -23,9 +23,8 @@ extern int errno; /* Les recuperations externes */ /*---------------------------------------------------------------------*/ @@ -23,8 +23,8 @@ #endif extern obj_t bgl_typeof( obj_t ); ---- runtime/Clib/cinit_obj.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ runtime/Clib/cinit_obj.c 2019-07-04 12:00:22.003011079 -0600 +--- runtime/Clib/cinit_obj.c.orig 2020-02-26 23:59:17.000000000 -0700 ++++ runtime/Clib/cinit_obj.c 2020-02-27 19:35:09.359901066 -0700 @@ -43,7 +43,7 @@ BGL_RUNTIME_DEF union nanobj bigloo_nan, /*---------------------------------------------------------------------*/ /* Importations */ @@ -34,11 +34,11 @@ extern void bgl_init_dynamic_env(); extern void bgl_init_symbol_table(); extern void bgl_init_socket(); ---- runtime/Clib/cmain.c.orig 2019-07-04 11:57:31.858132579 -0600 -+++ runtime/Clib/cmain.c 2019-07-04 12:00:22.004011078 -0600 +--- runtime/Clib/cmain.c.orig 2020-02-27 19:34:19.864047339 -0700 ++++ runtime/Clib/cmain.c 2020-02-27 19:35:09.359901066 -0700 @@ -36,8 +36,8 @@ BGL_RUNTIME_DEF long heap_size = DEFAULT /*---------------------------------------------------------------------*/ - /* Des recuperations externes */ + /* imports */ /*---------------------------------------------------------------------*/ -extern void cref(); -extern void memshow(); @@ -47,8 +47,8 @@ extern void bgl_init_eval_cnst(); extern obj_t c_constant_string_to_string( char * ); extern void c_error( char *, char *, int ) __attribute__((noreturn)); -@@ -48,7 +48,7 @@ extern void bgl_end_io(); - extern void GC_set_all_interior_pointers( int ); +@@ -49,7 +49,7 @@ extern void GC_set_all_interior_pointers + extern obj_t bgl_signal( int, obj_t ); #ifndef _MSC_VER -extern char *getenv(); @@ -56,8 +56,8 @@ #endif /*---------------------------------------------------------------------*/ ---- runtime/Clib/cports.c.orig 2019-07-04 11:57:31.859132578 -0600 -+++ runtime/Clib/cports.c 2019-07-04 12:00:22.004011078 -0600 +--- runtime/Clib/cports.c.orig 2020-02-27 19:34:19.866047334 -0700 ++++ runtime/Clib/cports.c 2020-02-27 19:35:09.361901060 -0700 @@ -113,7 +113,7 @@ /*---------------------------------------------------------------------*/ #if( BGL_HAVE_SENDFILE ) @@ -67,8 +67,8 @@ # define BGL_SENDFILE sendfile # else # if( BGL_SENDFILE_BRAND == BGL_SENDFILE_BSD ) ---- runtime/Clib/cprocess.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ runtime/Clib/cprocess.c 2019-07-04 12:00:22.004011078 -0600 +--- runtime/Clib/cprocess.c.orig 2020-02-26 23:59:17.000000000 -0700 ++++ runtime/Clib/cprocess.c 2020-02-27 19:35:09.362901057 -0700 @@ -57,7 +57,7 @@ extern obj_t bgl_close_input_port( obj_t extern long bgl_list_length( obj_t ); extern char *bgl_string_to_gc_cstring( obj_t ); @@ -78,8 +78,8 @@ extern obj_t make_string_sans_fill( long ); /*---------------------------------------------------------------------*/ ---- runtime/Clib/csocket.c.orig 2019-07-04 11:57:38.044129214 -0600 -+++ runtime/Clib/csocket.c 2019-07-04 12:00:22.005011078 -0600 +--- runtime/Clib/csocket.c.orig 2020-02-27 19:35:03.771917578 -0700 ++++ runtime/Clib/csocket.c 2020-02-27 19:35:09.363901054 -0700 @@ -149,12 +149,11 @@ extern unsigned char bgl_get_hash_number extern bool_t bigloo_strcmp( obj_t o1, obj_t o2 ); extern bool_t bgl_dns_enable_cache(); @@ -95,8 +95,8 @@ #endif /*---------------------------------------------------------------------*/ ---- runtime/Clib/inline_alloc.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ runtime/Clib/inline_alloc.c 2019-07-04 12:00:22.005011078 -0600 +--- runtime/Clib/inline_alloc.c.orig 2020-02-26 23:59:17.000000000 -0700 ++++ runtime/Clib/inline_alloc.c 2020-02-27 19:35:09.363901054 -0700 @@ -38,7 +38,7 @@ gcollect_verbose( unsigned long heapsz, GC_API void bgl_gc_verbose_set( bool_t verbose ) { diff --git a/bigloo-return.patch b/bigloo-return.patch index 4ec3ea1..7163d6c 100644 --- a/bigloo-return.patch +++ b/bigloo-return.patch @@ -1,55 +1,6 @@ ---- api/flac/src/Clib/bglflac.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/flac/src/Clib/bglflac.c 2019-07-04 14:03:36.608479002 -0600 -@@ -122,6 +122,7 @@ int bgl_flac_dump( char *l, unsigned cha - - fprintf( stderr, "\n" ); - fflush( stderr ); -+ return 0; - } - - /*---------------------------------------------------------------------*/ ---- api/libuv/src/Clib/bgluv.c.orig 2019-07-04 14:01:31.496607770 -0600 -+++ api/libuv/src/Clib/bgluv.c 2019-07-04 14:32:57.822811957 -0600 -@@ -2020,6 +2020,8 @@ string_array_to_vector( char *array[] ) - for( i = 0, runner = array; i < len; i++, runner++ ) { - VECTOR_SET( res, i, string_to_bstring( *runner ) ); - } -+ -+ return res; - } - - /*---------------------------------------------------------------------*/ ---- api/phidget/src/Clib/bglphidget.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/phidget/src/Clib/bglphidget.c 2019-07-04 14:02:52.921523965 -0600 -@@ -1647,6 +1647,7 @@ bgl_phidget_encoder_add_event_listener( - return CPhidgetEncoder_set_OnIndex_Handler( - id, &bgl_encoderindex_handler, hdl ); - } -+ return -1; - } - - /*---------------------------------------------------------------------*/ ---- api/ssl/src/C/bglssl.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/ssl/src/C/bglssl.c 2019-07-04 13:59:34.256728457 -0600 -@@ -1508,6 +1508,7 @@ bgl_ssl_connection_close( ssl_connection - SSL *_ssl = CCON( ssl )->BgL_z42nativez42; - - SSL_free( _ssl ); -+ return 0; - } - - /*---------------------------------------------------------------------*/ -@@ -2493,6 +2494,7 @@ unsupported: - BGL_RUNTIME_DEF obj_t - bgl_ssl_ctx_close( secure_context sc ) { - SSL_CTX_free( CSC( sc )->BgL_z42nativez42 ); -+ return BNIL; - } - - /*---------------------------------------------------------------------*/ ---- runtime/Clib/cmain.c.orig 2019-07-04 11:57:18.459139217 -0600 -+++ runtime/Clib/cmain.c 2019-07-04 13:57:22.882863809 -0600 -@@ -116,10 +116,6 @@ bigloo_exit( obj_t val ) { +--- runtime/Clib/cmain.c.orig 2020-02-27 19:33:58.330110986 -0700 ++++ runtime/Clib/cmain.c 2020-02-27 19:34:19.864047339 -0700 +@@ -115,10 +115,6 @@ bigloo_exit( obj_t val ) { n = (long)INTEGERP( val ) ? (long)CINT( val ) : 0; exit( n ); @@ -60,19 +11,19 @@ } /*---------------------------------------------------------------------*/ ---- runtime/Clib/cports.c.orig 2019-07-04 14:32:03.912846716 -0600 -+++ runtime/Clib/cports.c 2019-07-04 14:32:14.827836833 -0600 -@@ -1823,6 +1823,7 @@ bgl_input_port_seek( obj_t port, long po - "input-port does not support seeking", +--- runtime/Clib/cports.c.orig 2020-02-27 19:33:11.997247930 -0700 ++++ runtime/Clib/cports.c 2020-02-27 19:34:19.866047334 -0700 +@@ -1610,6 +1610,7 @@ bgl_input_string_seek( obj_t port, long + "illegal seek offset", port ); } + return port; } /*---------------------------------------------------------------------*/ ---- runtime/Clib/crgc.c.orig 2019-07-04 00:09:45.000000000 -0600 -+++ runtime/Clib/crgc.c 2019-07-04 13:57:22.884863807 -0600 -@@ -859,6 +859,7 @@ int rgc_debug_port( obj_t port, char *ms +--- runtime/Clib/crgc.c.orig 2020-02-26 23:59:17.000000000 -0700 ++++ runtime/Clib/crgc.c 2020-02-27 19:34:19.867047331 -0700 +@@ -859,6 +859,7 @@ void rgc_debug_port( obj_t port, char *m port, BSTRING_TO_STRING( INPUT_PORT_NAME( port ) ), matchstart, matchstop, forward, bufpos, bufsiz, eof ? "eof" : "" ); diff --git a/bigloo-underlink.patch b/bigloo-underlink.patch index 167a609..a1a393b 100644 --- a/bigloo-underlink.patch +++ b/bigloo-underlink.patch @@ -1,41 +1,35 @@ ---- api/avahi/src/Makefile.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/avahi/src/Makefile 2019-11-20 13:24:09.075756935 -0700 -@@ -47,11 +47,15 @@ CEFLAGS = +--- api/avahi/src/Makefile.orig 2020-02-27 19:35:34.172827734 -0700 ++++ api/avahi/src/Makefile 2020-02-27 19:36:39.824633705 -0700 +@@ -47,9 +47,9 @@ CEFLAGS = # Additional pthread lib for C ifeq "$(AVAHILIBS) " " " -EXTRALIBS = +EXTRALIBS = $(PTHREADLIBS) else --EXTRALIBS = $(AVAHILIBS) -+EXTRALIBS = $(AVAHILIBS) $(PTHREADLIBS) +-EXTRALIBS = $(AVAHILIBS) $(GCCLOSELIB) ++EXTRALIBS = $(AVAHILIBS) $(GCCLOSELIB) $(PTHREADLIBS) + EXTRALIBS_S = -lbigloopthread_s-$(RELEASE) + EXTRALIBS_U = -lbigloopthread_u-$(RELEASE) endif +--- api/mpg123/src/Makefile.orig 2020-02-27 19:35:34.172827734 -0700 ++++ api/mpg123/src/Makefile 2020-02-27 19:38:02.175390309 -0700 +@@ -55,11 +55,11 @@ endif -+EXTRALIBS_S = -lbigloopthread_s-$(RELEASE) -+EXTRALIBS_U = -lbigloopthread_u-$(RELEASE) -+ -+ - DISTRIB_FILES = $(C_SRC_DIR)/bglavahi.h - - #*---------------------------------------------------------------------*/ ---- api/mpg123/src/Makefile.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/mpg123/src/Makefile 2019-11-20 13:22:17.084569700 -0700 -@@ -52,11 +52,11 @@ EXTRALIBS = - else ifeq "$(ALSALIBS) " " " else --EXTRALIBS += $(MPG123LIBS) $(ALSALIBS) -lbigloomultimedia_u-$(RELEASE) -lbiglooalsa_u-$(RELEASE) -+EXTRALIBS += -lbigloomultimedia_u-$(RELEASE) -lbiglooalsa_u-$(RELEASE) $(MPG123LIBS) $(ALSALIBS) +-EXTRALIBS += $(ALSALIBS) -lbigloomultimedia_u-$(RELEASE) -lbiglooalsa_u-$(RELEASE) ++EXTRALIBS += -lbigloomultimedia_u-$(RELEASE) -lbiglooalsa_u-$(RELEASE) $(ALSALIBS) endif ifeq "$(PULSEAUDIOLIBS) " " " else --EXTRALIBS += $(MPG123LIBS) $(PULSEAUDIOLIBS) -lbigloomultimedia_u-$(RELEASE) -lbigloopulseaudio_u-$(RELEASE) -+EXTRALIBS += -lbigloomultimedia_u-$(RELEASE) -lbigloopulseaudio_u-$(RELEASE) $(MPG123LIBS) $(PULSEAUDIOLIBS) - endif +-EXTRALIBS += $(PULSEAUDIOLIBS) -lbigloomultimedia_u-$(RELEASE) -lbigloopulseaudio_u-$(RELEASE) ++EXTRALIBS += -lbigloomultimedia_u-$(RELEASE) -lbigloopulseaudio_u-$(RELEASE) $(PULSEAUDIOLIBS) endif ---- api/pkglib/src/Makefile.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/pkglib/src/Makefile 2019-11-20 13:20:12.573585115 -0700 + #*---------------------------------------------------------------------*/ +--- api/pkglib/src/Makefile.orig 2020-02-26 23:59:16.000000000 -0700 ++++ api/pkglib/src/Makefile 2020-02-27 19:35:34.173827731 -0700 @@ -45,8 +45,8 @@ SPIFLAGS = BMISCFLAGS = -I Llib @@ -47,10 +41,10 @@ #*---------------------------------------------------------------------*/ #* Scheme extended objects */ ---- api/pulseaudio/src/Makefile.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/pulseaudio/src/Makefile 2019-11-20 13:26:14.914720023 -0700 +--- api/pulseaudio/src/Makefile.orig 2020-02-26 23:59:16.000000000 -0700 ++++ api/pulseaudio/src/Makefile 2020-02-27 19:35:34.174827728 -0700 @@ -53,6 +53,10 @@ else - EXTRALIBS = $(PULSEAUDIOLIBS) + EXTRALIBS = $(PULSEAUDIOLIBS) -lbigloomultimedia_u-$(RELEASE) endif +EXTRALIBS_S = -lbigloomultimedia_s-$(RELEASE) @@ -60,8 +54,8 @@ #*---------------------------------------------------------------------*/ #* Scheme extended objects */ #*---------------------------------------------------------------------*/ ---- api/wav/src/Makefile.orig 2019-07-04 00:09:45.000000000 -0600 -+++ api/wav/src/Makefile 2019-11-20 13:21:03.173766069 -0700 +--- api/wav/src/Makefile.orig 2020-02-26 23:59:16.000000000 -0700 ++++ api/wav/src/Makefile 2020-02-27 19:35:34.174827728 -0700 @@ -47,12 +47,12 @@ BHEAPFLAGS = -unsafe -q -mkaddheap -mkad CEFLAGS = $(WAVCFLAGS) @@ -78,8 +72,8 @@ endif #*---------------------------------------------------------------------*/ ---- Makefile.misc.orig 2019-07-04 00:09:45.000000000 -0600 -+++ Makefile.misc 2019-11-20 11:59:44.139796140 -0700 +--- Makefile.misc.orig 2020-02-26 23:59:16.000000000 -0700 ++++ Makefile.misc 2020-02-27 19:35:34.175827725 -0700 @@ -89,8 +89,8 @@ shared-install-name: $(OBJECTS) \ $(GCSTDOBJECTS) \ diff --git a/bigloo.spec b/bigloo.spec index 5a0e4b9..8b1cb77 100644 --- a/bigloo.spec +++ b/bigloo.spec @@ -18,12 +18,12 @@ %global pkgname Bigloo # Bigloo has a customized copy of gc -%bcond_with customgc +%bcond_without customgc %global bundledgc 8.0.2 Name: bigloo -Version: 4.3f -Release: 4%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} +Version: 4.3g +Release: 1%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} Summary: A compiler for the Scheme programming language License: GPLv2+ @@ -59,33 +59,33 @@ BuildRequires: xemacs BuildRequires: xemacs-packages-extra BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: gmp-devel BuildRequires: indent BuildRequires: java-devel BuildRequires: jpackage-utils +BuildRequires: libunistring-devel BuildRequires: pkgconfig -BuildRequires: zip -BuildRequires: alsa-lib-devel -BuildRequires: avahi-devel -BuildRequires: flac-devel -%if %{without customgc} -BuildRequires: gc-devel -%endif -BuildRequires: gmp-devel -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-base-devel +BuildRequires: pkgconfig(alsa) %if %{with customgc} -BuildRequires: libatomic_ops-devel +BuildRequires: pkgconfig(atomic_ops) %endif -BuildRequires: libphidget-devel -BuildRequires: libunistring-devel -BuildRequires: libuv-devel -BuildRequires: mpg123-devel -BuildRequires: openssl-devel -BuildRequires: pcre-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: sqlite-devel +BuildRequires: pkgconfig(avahi-client) +%if %{without customgc} +BuildRequires: pkgconfig(bdw-gc) +%endif +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-audio-1.0) +BuildRequires: pkgconfig(libmpg123) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libphidget21) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libuv) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(sqlite3) BuildRequires: texinfo-tex BuildRequires: texi2html +BuildRequires: zip Requires: bigloo-libs%{?_isa} = %{version}-%{release} Requires: emacs-filesystem >= %{_emacs_version} @@ -347,6 +347,10 @@ make test %changelog +* Fri Feb 28 2020 Jerry James - 4.3g-1 +- Update to 4.3g +- Use the bundled gc again for performance reasons + * Tue Jan 28 2020 Fedora Release Engineering - 4.3f-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 12b6aaa..cf97813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bigloo4.3f.tar.gz) = cbe281480dc3a65e295aa2a032a20fc0b4df5e03ba4c8b52a056a65c694d1a5e7c08ab1599cfa94abe3b7a48b38d1a3646591938cef436f970a17c66ea26e2cf +SHA512 (bigloo4.3g.tar.gz) = d2fd864125b74304b70520b486c0660ab9a064adf257ab899c4a3ac602e8366762dccd4d4be765184b1776b464c7e8abb789b4c9461a3e35504db45c9587e668