From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp58.i.mail.ru (smtp58.i.mail.ru [217.69.128.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 56AEE46971A for ; Mon, 2 Dec 2019 00:01:38 +0300 (MSK) From: Vladislav Shpilevoy Date: Sun, 1 Dec 2019 22:01:34 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH decNumber 1/1] Fix build on Mac with gcc and XCode 11 List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, kyukhin@tarantool.org There is a bug in XCode 11 which makes some standard C headers not self sufficient. At least and are affected. When they are included first, compilation fails with creepy errors like this: In file included from /Applications/Xcode.app/Contents/Developer/ Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ sys/wait.h:110, from /Applications/Xcode.app/Contents/Developer/ Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ stdlib.h:66, from /Users/gerold/Work/Repositories/tarantool/third_party/ zstd/lib/common/zstd_common.c:16: /Applications/Xcode.app/Content/Developer/ Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ sys/resource.h: In function 'getiopolicy_np': /Applications/Xcode.app/Contents/Developer/ Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ sys/resource.h:447:34: error: expected declaration specifiers before '__OSX_AVAILABLE_STARTING' 447 | int getiopolicy_np(int, int) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_2_0); The patch workarounds the bug by changing header include order. Part of https://github.com/tarantool/tarantool/issues/4580 --- Issue: https://github.com/tarantool/tarantool/issues/4580 Branch: https://github.com/tarantool/decNumber/tree/gerold103/mac-build-gcc Note, the branch depends on another branch in decNumber repository. decNumber should be pushed first, then this branch should be updated to look at the newest decNumber. Discussion of the same issue from which I took the workaround: https://github.com/Homebrew/homebrew-core/issues/44579 decNumber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decNumber.c b/decNumber.c index e8947fe..85deb13 100644 --- a/decNumber.c +++ b/decNumber.c @@ -162,9 +162,9 @@ /* ** -- raise to the power */ /* ------------------------------------------------------------------ */ +#include // for strcpy #include // for malloc, free, etc. #include // for printf [if needed] -#include // for strcpy #include // for lower #include "decNumber.h" // base number library #include "decNumberLocal.h" // decNumber local types, etc. -- 2.21.0 (Apple Git-122.2)