Timo Myyrä <timo.my...@bittivirhe.fi> writes:
> Hi,
>
> Here's an bump to chicken scheme.
> Works here on amd64.
Hello,
builds fine, WANTLIB and plist ok, and from a quick test it's working
correctly. `make test` passes too :D
I've only one doubt
> -SHARED_LIBS= chicken 7.1 # 11
> +SHARED_LIBS= chicken 7.2 # 11
I think this should be a major bump because C_startup_time_seconds was
removed according to check_sym. It's not a big deal, libchicken isn't
used by anything in port, but anyway...
% /usr/src/lib/check_sym /usr/local/lib/libchicken.so.7.1 \
/usr/ports/pobj/chicken-5.3.0/fake-amd64/usr/local/lib/libchicken.so.*
/usr/local/lib/libchicken.so.7.1 -->
/usr/ports/pobj/chicken-5.3.0/fake-amd64/usr/local/lib/libchicken.so.7.2
Dynamic export changes:
added:
C_current_process_milliseconds
C_heap_half_min_free
C_startup_time_msec
C_startup_time_sec
heap_shrink_counter
removed:
C_startup_time_seconds
PLT added:
C_current_process_milliseconds
PLT removed:
C_pair
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/ports/lang/chicken/Makefile.inc,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.inc
--- Makefile.inc 3 Mar 2020 10:27:40 -0000 1.16
+++ Makefile.inc 4 Dec 2021 15:30:07 -0000
@@ -2,7 +2,7 @@
COMMENT= practical and portable Scheme system
-V= 5.2.0
+V= 5.3.0
DISTNAME= chicken-${V}
MAINTAINER= Timo Myyra <timo.my...@bittivirhe.fi>
Index: bootstrap/distinfo
===================================================================
RCS file: /home/cvs/ports/lang/chicken/bootstrap/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- bootstrap/distinfo 3 Mar 2020 10:27:40 -0000 1.9
+++ bootstrap/distinfo 4 Dec 2021 15:30:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
Index: core/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/chicken/core/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- core/Makefile 3 Mar 2020 10:27:40 -0000 1.15
+++ core/Makefile 4 Dec 2021 16:43:01 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.15 2020/03/03 10:27:40 semarie Exp $
-SHARED_LIBS= chicken 7.1 # 11
+SHARED_LIBS= chicken 8.0 # 11
TEST_TARGET= check
TEST_DEPENDS= ${BUILD_PKGPATH}
Index: core/distinfo
===================================================================
RCS file: /home/cvs/ports/lang/chicken/core/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- core/distinfo 3 Mar 2020 10:27:40 -0000 1.9
+++ core/distinfo 4 Dec 2021 15:30:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
Index: core/patches/patch-Makefile_bsd
===================================================================
RCS file: /home/cvs/ports/lang/chicken/core/patches/patch-Makefile_bsd,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_bsd
--- core/patches/patch-Makefile_bsd 27 Aug 2015 22:40:33 -0000 1.3
+++ core/patches/patch-Makefile_bsd 4 Dec 2021 15:30:07 -0000
@@ -1,15 +1,14 @@
-$OpenBSD: patch-Makefile_bsd,v 1.3 2015/08/27 22:40:33 juanfra Exp $
---- Makefile.bsd.orig Tue Aug 4 21:46:22 2015
-+++ Makefile.bsd Thu Aug 27 19:11:22 2015
-@@ -45,10 +45,9 @@ endif
+$OpenBSD$
+
+Index: Makefile.bsd
+--- Makefile.bsd.orig
++++ Makefile.bsd
+@@ -45,7 +45,7 @@ endif
LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
- LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R"$(RUNTIME_LINKER_PATH)"
-Wl,-L.
- LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R"$(RUNTIME_LINKER_PATH)"
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
-Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
+ LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
-LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(BINARYVERSION)
+LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIBchicken_VERSION)
LIBRARIES = -lm -lpthread
NEEDS_RELINKING = yes
--USES_SONAME = yes
-
- # special files
-
+ USES_SONAME = yes
Index: core/patches/patch-eval_scm
===================================================================
RCS file: /home/cvs/ports/lang/chicken/core/patches/patch-eval_scm,v
retrieving revision 1.5
diff -u -p -r1.5 patch-eval_scm
--- core/patches/patch-eval_scm 6 Aug 2019 18:19:51 -0000 1.5
+++ core/patches/patch-eval_scm 4 Dec 2021 15:30:07 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-eval_scm,v 1.5 2019/08/0
Index: eval.scm
--- eval.scm.orig
+++ eval.scm
-@@ -1110,8 +1110,7 @@
+@@ -1115,8 +1115,7 @@
(if uses-soname?
(string-append
load-library-extension
Index: core/patches/patch-rules_make
===================================================================
RCS file: /home/cvs/ports/lang/chicken/core/patches/patch-rules_make,v
retrieving revision 1.4
diff -u -p -r1.4 patch-rules_make
--- core/patches/patch-rules_make 17 Nov 2018 13:29:18 -0000 1.4
+++ core/patches/patch-rules_make 4 Dec 2021 15:30:07 -0000
@@ -12,3 +12,31 @@ Index: rules.make
$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_LINKER_OPTIONS) \
$(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
ifdef USES_SONAME
+@@ -281,9 +281,6 @@ ifdef DLLSINPATH
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(IBINDIR)"
+ else
+ ifdef USES_SONAME
+- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE)
"$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)"
+- cd "$(DESTDIR)$(ILIBDIR)" && ln -sf
$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)
lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)
+-else
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE)"
+ endif
+ endif
+@@ -415,7 +412,7 @@ uninstall:
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A)"
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
+ ifdef USES_SONAME
+- -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO).$(BINARYVERSION)"
++ -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
+ endif
+ ifdef WINDOWS
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(IBINDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
+@@ -972,7 +969,7 @@ clean:
+ $(foreach lib,$(DYNAMIC_IMPORT_LIBRARIES),chicken.$(lib).import.scm) \
+ $(BUILD_CONFIG_FILES)
+ ifdef USES_SONAME
+- -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(BINARYVERSION)
++ -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIB_chickenVERSION)
+ endif
+
+ confclean:
