diff --git a/server/database/libtdb/actions.py b/server/database/libtdb/actions.py index 4fe07c1ed6..028fb42f38 100644 --- a/server/database/libtdb/actions.py +++ b/server/database/libtdb/actions.py @@ -12,17 +12,29 @@ from pisi.actionsapi import shelltools shelltools.export("JOBS", get.makeJOBS().replace("-j", "")) def setup(): - shelltools.export("LDFLAGS", "-lpthread") - autotools.configure("\ - --builtin-libraries=replace \ - --bundled-libraries=NONE \ - --disable-rpath \ - ") + options = "--builtin-libraries=replace \ + --bundled-libraries=NONE \ + --disable-rpath \ + " + + if get.buildTYPE() == "_emul32": + shelltools.export("CC", "%s -m32" % get.CC()) + shelltools.export("CXX", "%s -m32" % get.CXX()) + shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + options += " --libdir=/usr/lib32 \ + --bindir=/usr/bin32 \ + --disable-python \ + " + #else: shelltools.export("LDFLAGS", "-lpthread") + autotools.configure(options) def build(): shelltools.system("make") def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - + if get.buildTYPE() == "_emul32": + pisitools.removeDir("usr/bin32") + return + pisitools.dodoc("docs/README") diff --git a/server/database/libtdb/pspec.xml b/server/database/libtdb/pspec.xml index 3301edcec3..2016fd468b 100644 --- a/server/database/libtdb/pspec.xml +++ b/server/database/libtdb/pspec.xml @@ -1,9 +1,9 @@ - + libtdb - https://tdb.samba.org/ + https://tdb.samba.org PisiLinux Community admins@pisilinux.org @@ -47,15 +47,39 @@ /usr/lib/pkgconfig + /usr/lib32/pkgconfig /usr/include + + libtdb-32bit + emul32 + 32-bit shared libraries for libtdb + _emul32 + + libgcc + + + libtdb + libgcc + + + /usr/lib32 + + + + 2020-11-28 + 1.4.3 + Rebuild 32bit. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-14 1.4.3 - Version bump + Version bump. İdris Kalp idriskalp@gmail.com