diff options
| author | Sergey V. Lobanov <sergey@lobanov.in> | 2022-02-10 02:03:57 +0300 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-02-09 16:04:35 -0800 |
| commit | a8f875da0e347e5553015b29b81bf92ba319e55e (patch) | |
| tree | f173104701a64fdd069da85aa5b75e4b3d943447 /libs/libtalloc | |
| parent | 289a751530f43ad48e2ac1389132851c6d645613 (diff) | |
libtalloc: fix build on macos
This commit adds patch to fix the issue with 'echo -n' on macos
Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
Diffstat (limited to 'libs/libtalloc')
| -rw-r--r-- | libs/libtalloc/Makefile | 2 | ||||
| -rw-r--r-- | libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/libs/libtalloc/Makefile b/libs/libtalloc/Makefile index a1209784f..71173504a 100644 --- a/libs/libtalloc/Makefile +++ b/libs/libtalloc/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=talloc PKG_VERSION:=2.3.1 MAJOR_VERSION:=2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.samba.org/ftp/talloc diff --git a/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch b/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch new file mode 100644 index 000000000..9b8aca00e --- /dev/null +++ b/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch @@ -0,0 +1,25 @@ +From: https://gitlab.com/samba-team/samba/-/merge_requests/2374/diffs?commit_id=90bb371863d5a44845f47ebbceeb60842b46eda7 + +From 79b2f38c27c8df918d8260fe838f55bcf6d3eb73 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Lobanov" <sergey@lobanov.in> +Date: Thu, 10 Feb 2022 00:02:17 +0300 +Subject: [PATCH] wafsamba: replace 'echo -n' with printf + +This patch makes samba_cross.py compatible with old bash (e.g. 3.2) + +Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in> +--- + buildtools/wafsamba/samba_cross.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/buildtools/wafsamba/samba_cross.py ++++ b/buildtools/wafsamba/samba_cross.py +@@ -134,7 +134,7 @@ class cross_Popen(Utils.subprocess.Popen + cross_answers_incomplete = True + add_answer(ca_file, msg, ans) + (retcode, retstring) = ans +- args = ['/bin/sh', '-c', "echo -n '%s'; exit %d" % (retstring, retcode)] ++ args = ['/bin/sh', '-c', "printf '%s'; exit %d" % (retstring, retcode)] + real_Popen.__init__(*(obj, args), **kw) + + |