diff --git a/system/base/glib2/actions.py b/system/base/glib2/actions.py
index 1f966dc4..68b719c2 100644
--- a/system/base/glib2/actions.py
+++ b/system/base/glib2/actions.py
@@ -9,6 +9,7 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
+builddir = "build32" if get.buildTYPE() == 'emul32' else "build"
def setup():
options = "-Dselinux=disabled \
@@ -17,13 +18,15 @@ def setup():
if get.buildTYPE() == "_emul32":
- options += " --libdir=/usr/lib32 \
+ options += " --libdir=/_emul32/lib32 \
--bindir=/_emul32/bin \
--sbindir=/_emul32/sbin \
- --prefix=/usr"
+ --prefix=/_emul32 \
+ -Dlibmount=false"
shelltools.export("CC", "%s -m32" % get.CC())
shelltools.export("CXX", "%s -m32" % get.CXX())
shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
+ shelltools.system("patch -p1 < multilib.diff")
else :
options += " --libdir=/usr/lib \
--bindir=/usr/bin \
@@ -32,28 +35,29 @@ def setup():
--prefix=/usr"
#autotools.autoreconf("-vif")
- shelltools.makedirs("build")
- shelltools.cd("build")
+ shelltools.makedirs("%s" %builddir)
+ shelltools.cd("%s" %builddir)
shelltools.system("meson .. %s" % options)
#pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
#autotools.make("-j1")
- shelltools.cd("build")
+ shelltools.cd("%s" %builddir)
shelltools.system("ninja")
def install():
- shelltools.cd("build")
+ shelltools.cd("%s" %builddir)
#autotools.rawInstall("DESTDIR=%s" % get.installDIR())
- shelltools.system("ninja install")
+ shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
if get.buildTYPE() == "_emul32":
pisitools.domove("/_emul32/bin/gio-querymodules", "/usr/bin/32/")
+ pisitools.domove("/_emul32/lib32", "/usr")
pisitools.removeDir("/_emul32")
- #pisitools.removeDir("/usr/share/gdb")
if get.buildTYPE() != "_emul32":
+ pisitools.removeDir("/usr/share/gdb")
shelltools.cd("..")
pisitools.dodoc("AUTHORS", "COPYING", "README*")
diff --git a/system/base/glib2/files/multilib.diff b/system/base/glib2/files/multilib.diff
new file mode 100644
index 00000000..c3b4ed30
--- /dev/null
+++ b/system/base/glib2/files/multilib.diff
@@ -0,0 +1,12 @@
+diff --git i/gio/tests/meson.build w/gio/tests/meson.build
+index 65f43e267..3bd66bf60 100644
+--- i/gio/tests/meson.build
++++ w/gio/tests/meson.build
+@@ -598,6 +598,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+ '-r',
+ '-b','binary',
+ '@INPUT@',
++ '--oformat', 'elf32-i386',
+ '-o','@OUTPUT@'])
+
+ # Rename symbol to match the one in the C file
diff --git a/system/base/glib2/pspec.xml b/system/base/glib2/pspec.xml
index 464ac823..3533cb5b 100644
--- a/system/base/glib2/pspec.xml
+++ b/system/base/glib2/pspec.xml
@@ -17,6 +17,7 @@
libpcre-devel
zlib-devel
libffi-devel
+ libutil-linux-devel
docbook-xsl
meson
ninja
@@ -24,6 +25,9 @@
noisy-glib-compile-schemas.diff
+
+ multilib.diff
+
@@ -32,7 +36,9 @@
libpcre
zlib
- libffi
+ libffi
+ elfutils
+ libutil-linux
/etc/profile.d
@@ -62,7 +68,10 @@
Development files for glib2
glib2
- libpcre-devel
+ libpcre-devel
+ zlib-devel
+ libffi-devel
+ libutil-linux-devel
/usr/bin/gtester
@@ -128,6 +137,13 @@
+
+ 2019-12-22
+ 2.62.4
+ Version bump
+ Idris Kalp
+ idriskalp@gmail.com
+
2019-04-05
2.54.3