diff --git a/programming/misc/libtalloc/actions.py b/programming/misc/libtalloc/actions.py index 6a17855ebe..a425251c03 100644 --- a/programming/misc/libtalloc/actions.py +++ b/programming/misc/libtalloc/actions.py @@ -7,26 +7,39 @@ from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools libdir = "lib32" if get.buildTYPE() == "emul32" else "lib" jobs = get.makeJOBS().replace("-j", "") def setup(): - autotools.configure("\ - --sysconfdir=/etc/samba \ - --builtin-libraries=replace \ - --bundled-libraries=NONE \ - --disable-rpath \ - --disable-rpath-install \ - --disable-silent-rules \ - --enable-talloc-compat1 \ - ") + options = "--sysconfdir=/etc/samba \ + --builtin-libraries=replace \ + --bundled-libraries=NONE \ + --disable-rpath \ + --disable-rpath-install \ + --disable-silent-rules \ + --enable-talloc-compat1" + + + if get.buildTYPE() == "emul32": + options += " --libdir=/usr/lib32 \ + + " + elif get.ARCH() == "x86_64": + options += " --extra-python=/usr/bin/python \ + + " + autotools.configure(options) def build(): autotools.make("JOBS=%s" % jobs) def install(): autotools.rawInstall("DESTDIR=%s JOBS=%s" % (get.installDIR(), jobs)) + + if get.buildTYPE() == "emul32": + return #pisitools.removeDir("/usr/share/swig") diff --git a/programming/misc/libtalloc/pspec.xml b/programming/misc/libtalloc/pspec.xml index 6fc3d140f5..f2a6eb7a79 100644 --- a/programming/misc/libtalloc/pspec.xml +++ b/programming/misc/libtalloc/pspec.xml @@ -3,7 +3,7 @@ libtalloc - http://talloc.samba.org + https://talloc.samba.org/ PisiLinux Community admins@pisilinux.org @@ -12,20 +12,27 @@ library Hierarchical pool based memory allocator libtalloc is a library which implements a hierarchical allocator with destructors which is the core memory allocator in samba. - http://www.samba.org/ftp/talloc/talloc-2.1.14.tar.gz + http://www.samba.org/ftp/talloc/talloc-2.1.16.tar.gz docbook-xsl libxslt-devel python-devel + python3-devel libbsd-devel attr-devel + libtirpc-devel + rpcsvc-proto-devel + + + libtalloc python + python3 libbsd attr @@ -56,7 +63,7 @@ 32-bit shared libraries for libtalloc emul32 - + libxslt-32bit attr-32bit @@ -70,6 +77,13 @@ + + 2019-04-04 + 2.1.16 + Version Bump + Mustafa Cinasal + muscnsl@gmail.com + 2018-08-06 2.1.14