diff --git a/libs/_autotools/libtasn1/libtasn1.py b/libs/_autotools/libtasn1/libtasn1.py --- a/libs/_autotools/libtasn1/libtasn1.py +++ b/libs/_autotools/libtasn1/libtasn1.py @@ -21,4 +21,7 @@ def __init__(self, **args): AutoToolsPackageBase.__init__(self) self.subinfo.options.configure.args += " --disable-static --enable-shared " + # Don't include the system aclocal files since it breaks gnulib: + # https://lists.gnu.org/archive/html/bug-gnulib/2016-12/msg00140.html + self.subinfo.options.configure.useDefaultAutoreconfIncludes = False diff --git a/libs/_autotools/libunistring/libunistring.py b/libs/_autotools/libunistring/libunistring.py --- a/libs/_autotools/libunistring/libunistring.py +++ b/libs/_autotools/libunistring/libunistring.py @@ -14,7 +14,12 @@ self.archiveNames["0.9.8"] = "libunistring-0.9.8.tar.xz" self.targetInstSrc["0.9.8"] = "libunistring-0.9.8" - self.defaultTarget = "0.9.8" + self.targets["0.9.10"] = "https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz" + self.targetDigests["0.9.10"] = (['eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7'], CraftHash.HashAlgorithm.SHA256) + self.archiveNames["0.9.10"] = "libunistring-0.9.10.tar.xz" + self.targetInstSrc["0.9.10"] = "libunistring-0.9.10" + + self.defaultTarget = "0.9.10" def setDependencies(self): self.runtimeDependencies["virtual/base"] = "default" @@ -25,3 +30,6 @@ def __init__(self, **args): AutoToolsPackageBase.__init__(self) self.subinfo.options.configure.args += " --disable-static --enable-shared " + # Don't include the system aclocal files since it breaks gnulib: + # https://lists.gnu.org/archive/html/bug-gnulib/2016-12/msg00140.html + self.subinfo.options.configure.useDefaultAutoreconfIncludes = False