Commit 79d79089 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated glib to 2.60.4

parent 8d7c58ee
all: all:
tar xf glib-2.56.1.tar.xz tar xf glib-2.60.4.tar.xz
patch -Np1 -d glib-2.56.1 < glib-2.56.1-tests.patch cd glib-2.60.4 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --with-pcre=system
cd glib-2.56.1 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --with-pcre=system cd glib-2.60.4 && make
cd glib-2.56.1 && make cd glib-2.60.4 && make install
cd glib-2.56.1 && make install
chmod -v 755 /usr/bin/{gdbus-codegen,glib-gettextize} chmod -v 755 /usr/bin/{gdbus-codegen,glib-gettextize}
mkdir -p /usr/share/doc/glib-2.56.1 mkdir -p /usr/share/doc/glib-2.60.4
cp -r glib-2.56.1/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.56.1 cp -r glib-2.60.4/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.60.4
tests: 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.56.1 glib-home ; \ chown -R nobody.nobody glib-2.60.4 glib-home ; \
cd glib-2.56.1 ; \ cd glib-2.60.4 ; \
su nobody -s /bin/bash -c "HOME=$(CURDIR)/glib-home make check" ; \ su nobody -s /bin/bash -c "HOME=$(CURDIR)/glib-home make check" ; \
fi fi
rm -rf glib-2.56.1 rm -rf glib-2.60.4
rm -rf glib-home rm -rf glib-home
diff -uNr glib-2.56.1/glib/tests/gwakeuptest.c glib-2.56.1-tests/glib/tests/gwakeuptest.c
--- glib-2.56.1/glib/tests/gwakeuptest.c 2016-10-22 15:51:44.000000000 +1030
+++ glib-2.56.1-tests/glib/tests/gwakeuptest.c 2018-05-20 15:22:28.605600147 +0930
@@ -33,7 +33,7 @@
gint i;
/* prevent the test from deadlocking */
- alarm (60);
+ alarm (60 * 4);
wakeup = g_wakeup_new ();
g_assert (!check_signaled (wakeup));
@@ -213,7 +213,7 @@
gint i;
/* make sure we don't block forever */
- alarm (60);
+ alarm (60 * 4);
/* simple mainloop test based on GWakeup.
*
diff -uNr glib-2.56.1/tests/threadpool-test.c glib-2.56.1-tests/tests/threadpool-test.c
--- glib-2.56.1/tests/threadpool-test.c 2016-10-22 15:47:10.000000000 +1030
+++ glib-2.56.1-tests/tests/threadpool-test.c 2018-05-20 15:22:57.210681093 +0930
@@ -13,7 +13,7 @@
# define DEBUG_MSG(x)
#endif
-#define WAIT 5 /* seconds */
+#define WAIT 20 /* seconds */
#define MAX_THREADS 10
/* if > 0 the test will run continuously (since the test ends when
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