Commit 3eceb6f1 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed compilation and testing

parent 79d79089
all: all:
tar xf glib-2.60.4.tar.xz tar xf glib-2.60.4.tar.xz
cd glib-2.60.4 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --with-pcre=system patch -Np1 -d glib-2.60.4 < glib-2.60.4-fix_tests.patch
cd glib-2.60.4 && make cd glib-2.60.4 && mkdir -p build
cd glib-2.60.4 && make install cd glib-2.60.4/build && meson --prefix=/usr -Dman=false -Dselinux=disabled ..
chmod -v 755 /usr/bin/{gdbus-codegen,glib-gettextize} cd glib-2.60.4/build && ninja
cd glib-2.60.4/build && ninja install
mkdir -p /usr/share/doc/glib-2.60.4 mkdir -p /usr/share/doc/glib-2.60.4
cp -r glib-2.60.4/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.60.4 cp -r glib-2.60.4/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.60.4
...@@ -11,8 +12,8 @@ tests: ...@@ -11,8 +12,8 @@ tests:
mkdir glib-home mkdir glib-home
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \ if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
chown -R nobody.nobody glib-2.60.4 glib-home ; \ chown -R nobody.nobody glib-2.60.4 glib-home ; \
cd glib-2.60.4 ; \ cd glib-2.60.4/build ; \
su nobody -s /bin/bash -c "HOME=$(CURDIR)/glib-home make check" ; \ su nobody -s /bin/bash -c "HOME=$(CURDIR)/glib-home ninja test" ; \
fi fi
rm -rf glib-2.60.4 rm -rf glib-2.60.4
rm -rf glib-home rm -rf glib-home
diff -uNr glib-2.60.4/gio/tests/gsocketclient-slow.c glib-2.60.4-fix_tests/gio/tests/gsocketclient-slow.c
--- glib-2.60.4/gio/tests/gsocketclient-slow.c 2019-06-11 03:17:20.000000000 +0930
+++ glib-2.60.4-fix_tests/gio/tests/gsocketclient-slow.c 2019-09-11 13:54:55.796925394 +0930
@@ -55,7 +55,7 @@
* trigger the logic to make multiple parallel connections.
*/
client = g_socket_client_new ();
- g_socket_client_connect_to_host_async (client, "localhost", port, NULL, on_connected, loop);
+ g_socket_client_connect_to_host_async (client, "127.0.0.1", port, NULL, on_connected, loop);
g_main_loop_run (loop);
g_main_loop_unref (loop);
@@ -123,7 +123,7 @@
client = g_socket_client_new ();
cancel = g_cancellable_new ();
- g_socket_client_connect_to_host_async (client, "localhost", port, cancel, on_connected_cancelled, loop);
+ g_socket_client_connect_to_host_async (client, "127.0.0.1", port, cancel, on_connected_cancelled, loop);
g_timeout_add (1, (GSourceFunc) on_timer, cancel);
g_signal_connect (client, "event", G_CALLBACK (on_event), &got_completed_event);
g_main_loop_run (loop);
@@ -159,7 +159,7 @@
client = g_socket_client_new ();
cancel = g_cancellable_new ();
g_cancellable_cancel (cancel);
- g_socket_client_connect_to_host_async (client, "localhost", port, cancel, on_connected_cancelled, loop);
+ g_socket_client_connect_to_host_async (client, "127.0.0.1", port, cancel, on_connected_cancelled, loop);
g_signal_connect (client, "event", G_CALLBACK (on_event), &got_completed_event);
g_main_loop_run (loop);
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