libtalloc: fix build on macos
authorSergey V. Lobanov <sergey@lobanov.in>
Wed, 9 Feb 2022 23:03:57 +0000 (02:03 +0300)
committerRosen Penev <rosenp@gmail.com>
Thu, 10 Feb 2022 00:04:35 +0000 (16:04 -0800)
This commit adds patch to fix the issue with 'echo -n' on macos

Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
libs/libtalloc/Makefile
libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch [new file with mode: 0644]

index a1209784fc99c4ba000b0d8203241c148a728388..71173504a7191c7437303a8103e37c6a8f362aa3 100644 (file)
@@ -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 (file)
index 0000000..9b8aca0
--- /dev/null
@@ -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)