Commit e3e778d1 authored by NIIBE Yutaka's avatar NIIBE Yutaka

Imported Debian patch 0.9.4-4

parent c6a3c325
gauche (0.9.4-4) unstable; urgency=low
* debian/patches/38_libgc_ppc64el.patch: New (Closes: #766639).
Thanks to Frederic Bonnard.
* debian/patches/39_net_test.patch: New to disable network test.
* debian/libgauche-0.9-0.symbols: Updated for ppc64 and ppc64el.
-- NIIBE Yutaka <gniibe@fsij.org> Tue, 04 Nov 2014 03:43:51 +0000
gauche (0.9.4-3) unstable; urgency=low
* debian/rules: Fix FTBFS for sparc.
......
......@@ -1107,8 +1107,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)AO_store_full_emulation@Base 0.9.3
(optional)GC_FirstDLOpenedLinkMap@Base 0.9.3
#(optional)GC_abort@Base 0.9 #missing 0.9.4
(optional)GC_acquire_mark_lock@Base 0.9.4
(optional)GC_active_count@Base 0.9.4
(optional)GC_add_ext_descriptor@Base 0.9
#(optional)GC_add_leaked@Base 0.9 #missing 0.9.3
(optional)GC_add_map_entry@Base 0.9
......@@ -1157,7 +1155,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_build_fl_clear2@Base 0.9
(optional)GC_build_fl_clear4@Base 0.9
#(optional)GC_bytes_allocd_at_reset@Base 0.9 #missing 0.9.3
(optional)GC_bytes_allocd_tmp@Base 0.9.4
(optional)GC_bytes_found@Base 0.9
(optional)GC_call_with_alloc_lock@Base 0.9
(optional)GC_call_with_gc_active@Base 0.9.3
......@@ -1246,8 +1243,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_dlopen@Base 0.9
(optional)GC_do_blocking@Base 0.9
(optional)GC_do_blocking_inner@Base 0.9.3
(optional)GC_do_local_mark@Base 0.9.4
(optional)GC_do_parallel_mark@Base 0.9.4
#(optional)GC_do_nothing@Base 0.9 #missing 0.9.3
(optional)GC_dont_expand@Base 0.9
(optional)GC_dont_gc@Base 0.9
......@@ -1292,8 +1287,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_find_header@Base 0.9
(optional)GC_find_leak@Base 0.9
(optional)GC_finish_collection@Base 0.9
(optional)GC_first_nonempty@Base 0.9.4
(optional)GC_fl_builder_count@Base 0.9.4
(optional)GC_fo_entries@Base 0.9
(optional)GC_fo_head@Base 0.9.4
(optional)GC_force_unmap_on_gcollect@Base 0.9.3
......@@ -1376,9 +1369,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
#(optional)GC_hdr_cache_hits@Base 0.9 #missing 0.9.3
#(optional)GC_hdr_cache_misses@Base 0.9 #missing 0.9.3
(optional)GC_header_cache_miss@Base 0.9
(optional)GC_help_marker@Base 0.9.4
(optional)GC_help_wanted@Base 0.9.4
(optional)GC_helper_count@Base 0.9.4
#(optional)GC_high_water@Base 0.9 #missing 0.9.3
(optional)GC_ignore_self_finalize_mark_proc@Base 0.9
(optoinal)GC_ignore_warn_proc@Base 0.9.3
......@@ -1444,8 +1434,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_mark_and_push_stack@Base 0.9
(optional)GC_mark_from@Base 0.9
(optional)GC_mark_init@Base 0.9
(optional)GC_mark_local@Base 0.9.4
(optional)GC_mark_no@Base 0.9.4
(optional)GC_mark_some@Base 0.9
#(optional)GC_mark_stack@Base 0.9 #missing 0.9.4
#(optional)GC_mark_stack_empty@Base 0.9 #missing 0.9.4
......@@ -1454,8 +1442,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_mark_stack_too_small@Base 0.9
#(optional)GC_mark_stack_top@Base 0.9 #missing 0.9.4
(optional)GC_mark_state@Base 0.9
(optional)GC_mark_thread@Base 0.9.4
(optional)GC_mark_threads@Base 0.9.4
(optional)GC_max_heapsize@Base 0.9.4
(optional)GC_max_retries@Base 0.9
(optional)GC_maybe_gc@Base 0.9
......@@ -1493,8 +1479,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_noop6@Base 0.9.4
(optional)GC_noop_sink@Base 0.9.3
(optional)GC_normal_finalize_mark_proc@Base 0.9
(optional)GC_notify_all_builder@Base 0.9.4
(optional)GC_notify_all_marker@Base 0.9.4
#(optional)GC_notify_full_gc@Base 0.9 #missing 0.9.3
(optional)GC_notify_or_invoke_finalizers@Base 0.9
(optional)GC_nprocs@Base 0.9
......@@ -1609,7 +1593,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_register_main_static_data@Base 0.9
(optional)GC_register_my_thread@Base 0.9
(optional)GC_register_my_thread_inner@Base 0.9
(optional)GC_release_mark_lock@Base 0.9.4
(optional)GC_remove_allowed_signals@Base 0.9
(optional)GC_remove_all_threads_but_me@Base 0.9.3
(optional)GC_remove_counts@Base 0.9
......@@ -1623,7 +1606,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_remove_tmp_roots@Base 0.9
(optional)GC_restart_handler@Base 0.9
(optional)GC_retry_signals@Base 0.9
(optional)GC_return_mark_stack@Base 0.9.4
(optional)GC_root_size@Base 0.9
(optional)GC_roots_present@Base 0.9
(optional)GC_same_obj@Base 0.9
......@@ -1680,7 +1662,6 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_start_world@Base 0.9
(optional)GC_stderr@Base 0.9
(optional)GC_stdout@Base 0.9
(optional)GC_steal_mark_stack@Base 0.9.4
(optional)GC_stop_count@Base 0.9
(optional)GC_stop_init@Base 0.9
(optional)GC_stop_world@Base 0.9
......@@ -1721,10 +1702,7 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(optional)GC_use_entire_heap@Base 0.9
(optional)GC_used_heap_size_after_full@Base 0.9
(optional)GC_version@Base 0.9
(optional)GC_wait_builder@Base 0.9.4
(optional)GC_wait_for_gc_completion@Base 0.9
(optional)GC_wait_for_reclaim@Base 0.9.4
(optional)GC_wait_marker@Base 0.9.4
(optional)GC_with_callee_saves_pushed@Base 0.9
(optional)GC_world_is_stopped@Base 0.9
(optional)GC_world_stopped@Base 0.9
......@@ -1804,3 +1782,30 @@ libgauche-0.9.so.0 libgauche-0.9-0 #MINVER#
(arch=!hurd-i386|optional)GC_unix_mmap_get_mem@Base 0.9
#(arch=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc sparc64 s390 m68k sh4 avr32 armhf powerpcspe)
### mipsel, sparc64, sh4, m68k, avr32
# !ppc64el !ppc64
(arch=!ppc64el !ppc64|optional)GC_acquire_mark_lock@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_active_count@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_bytes_allocd_tmp@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_do_local_mark@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_do_parallel_mark@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_first_nonempty@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_fl_builder_count@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_help_marker@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_help_wanted@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_helper_count@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_mark_local@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_mark_no@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_mark_thread@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_mark_threads@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_notify_all_builder@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_notify_all_marker@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_release_mark_lock@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_return_mark_stack@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_steal_mark_stack@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_wait_builder@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_wait_for_reclaim@Base 0.9.4
(arch=!ppc64el !ppc64|optional)GC_wait_marker@Base 0.9.4
# ppc64el ppc64
(arch=ppc64el ppc64|optional) GC_push_marked1@Base 0.9.4-4
(arch=ppc64el ppc64|optional) GC_push_marked2@Base 0.9.4-4
(arch=ppc64el ppc64|optional) GC_push_marked4@Base 0.9.4-4
Description: ppc64el libgc configuration
Author: NIIBE Yutaka <gniibe@fsij.org>
Index: gauche-0.9.4/gc/configure.ac
===================================================================
--- gauche-0.9.4.orig/gc/configure.ac
+++ gauche-0.9.4/gc/configure.ac
@@ -199,9 +199,16 @@ case "$THREADS" in
*-*-linux*)
AC_DEFINE(GC_LINUX_THREADS)
AC_DEFINE(_REENTRANT)
- if test "${enable_parallel_mark}" != no; then
- AC_DEFINE(PARALLEL_MARK)
- fi
+ case "$host" in
+ powerpc64*-*-*-*)
+ # Not enable PARALLEL_MARK
+ ;;
+ *)
+ if test "${enable_parallel_mark}" != no; then
+ AC_DEFINE(PARALLEL_MARK)
+ fi
+ ;;
+ esac
AC_DEFINE(THREAD_LOCAL_ALLOC)
AC_MSG_WARN("Explicit GC_INIT() calls may be required.");
;;
Description: net test patch
Author: NIIBE Yutaka <gniibe@fsij.org>
Index: gauche-0.9.4/ext/net/test.scm
===================================================================
--- gauche-0.9.4.orig/ext/net/test.scm
+++ gauche-0.9.4/ext/net/test.scm
@@ -379,10 +379,13 @@
(sys-unlink "sock.o")
-(test* "inet server socket" #t
+(cond
+ [#t "Don't run test which use network (even if it's localhost only)."]
+ [else
+ (test* "inet server socket" #t
(run-simple-server `(make-server-sockets #f ,*inet-port* :reuse-addr? #t)))
-(test* "inet client socket" '("ABC" "XYZ")
+ (test* "inet client socket" '("ABC" "XYZ")
(call-with-client-socket (make-client-socket 'inet "localhost" *inet-port*)
(^[in out]
(display "abc\n" out) (flush out)
@@ -390,7 +393,7 @@
(display "xyz\n" out) (flush out)
(list abc (read-line in))))))
-(test* "inet client socket (host,port)" #t
+ (test* "inet client socket (host,port)" #t
(call-with-client-socket (make-client-socket "localhost" *inet-port*)
(^[in out]
(display (make-string *chunk-size* #\a) out)
@@ -398,7 +401,7 @@
(flush out)
(string=? (read-line in) (make-string *chunk-size* #\A)))))
-(test* "inet client socket (sockaddr)" #t
+ (test* "inet client socket (sockaddr)" #t
(call-with-client-socket (make-client-socket
(make <sockaddr-in>
:host "localhost" :port *inet-port*))
@@ -408,12 +411,12 @@
(flush out)
(string=? (read-line in) (make-string *chunk-size* #\A)))))
-(test* "inet client socket (termination)" 33
+ (test* "inet client socket (termination)" 33
(call-with-client-socket (make-client-socket 'inet "localhost" *inet-port*)
(^[in out]
(display "END\n" out) (flush out)
(receive (pid code) (sys-wait)
- (sys-wait-exit-status code)))))
+ (sys-wait-exit-status code)))))])
(cond-expand
......@@ -14,3 +14,5 @@
35_axtls_error.patch
36_sparc.patch
37_ppc64el.patch
38_libgc_ppc64el.patch
39_net_test.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment