Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
glib
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
glib
Commits
3eceb6f1
Commit
3eceb6f1
authored
Sep 12, 2019
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compilation and testing
parent
79d79089
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
6 deletions
+37
-6
Makefile
Makefile
+7
-6
glib-2.60.4-fix_tests.patch
glib-2.60.4-fix_tests.patch
+30
-0
No files found.
Makefile
View file @
3eceb6f1
all
:
tar
xf glib-2.60.4.tar.xz
cd
glib-2.60.4
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
--with-pcre
=
system
cd
glib-2.60.4
&&
make
cd
glib-2.60.4
&&
make
install
chmod
-v
755 /usr/bin/
{
gdbus-codegen,glib-gettextize
}
patch
-Np1
-d
glib-2.60.4 < glib-2.60.4-fix_tests.patch
cd
glib-2.60.4
&&
mkdir
-p
build
cd
glib-2.60.4/build
&&
meson
--prefix
=
/usr
-Dman
=
false
-Dselinux
=
disabled ..
cd
glib-2.60.4/build
&&
ninja
cd
glib-2.60.4/build
&&
ninja
install
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
...
...
@@ -11,8 +12,8 @@ tests:
mkdir
glib-home
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
chown
-R
nobody.nobody glib-2.60.4 glib-home
;
\
cd
glib-2.60.4
;
\
su nobody
-s
/bin/bash
-c
"HOME=
$(CURDIR)
/glib-home
make check
"
;
\
cd
glib-2.60.4
/build
;
\
su nobody
-s
/bin/bash
-c
"HOME=
$(CURDIR)
/glib-home
ninja test
"
;
\
fi
rm
-rf
glib-2.60.4
rm
-rf
glib-home
glib-2.60.4-fix_tests.patch
0 → 100644
View file @
3eceb6f1
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);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment