From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 121757 invoked by alias); 3 May 2017 16:32:48 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 121708 invoked by uid 89); 3 May 2017 16:32:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: EUR03-DB5-obe.outbound.protection.outlook.com Received: from mail-eopbgr40094.outbound.protection.outlook.com (HELO EUR03-DB5-obe.outbound.protection.outlook.com) (40.107.4.94) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 May 2017 16:32:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=CMHaCqJs/O+OaiaLOj2H5cRQqZ/J7Lh6ksxQwyi7EPI=; b=kCCGkhuGlLN6baYOf8AvNUrLDpizxPXk0TOCaYiyHDFuf1If3uO9x0OE1zLVSCrWo9hThTidIEJD3uhb2odDWkIodcttYpXpuXUG8lrbz2Apit3HH/GLHDp6vyKM0SuNG/GXL8WSaoyv8FlUFgnCG5dH9b/j612J2vXalaBLi/c= Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io; Received: from [10.9.78.56] (62.220.2.194) by DB3PR02MB234.eurprd02.prod.outlook.com (2a01:111:e400:9410::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 3 May 2017 16:32:45 +0000 From: Ulf Hermann Subject: [PATCH] If f(un)lockfile is unavailable define it away To: Message-ID: <1ca32ffc-b613-4481-5886-ad782865e497@qt.io> Date: Thu, 04 May 2017 08:16:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: VI1P18901CA0013.EURP189.PROD.OUTLOOK.COM (2603:10a6:801::23) To DB3PR02MB234.eurprd02.prod.outlook.com (2a01:111:e400:9410::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 811563e7-f016-41f7-fce0-08d492420748 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:DB3PR02MB234; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;3:skSJpVaWOQxsgr4jXl2SLTUZ58zA18SDV2XkCxX62n+clRri1MT1EB0yk6qrs95x2cZkQpNF/FDAGBaO7FhSTswP7XFq6JJ2yAS8l1r9gwhS0wqN4ppZEV3vKHKSFZi8Dmyx6PNUN05zxMOvmBrTSmXgBo34DY+71JSuvF4YWRn9Cvn4fu/zYo9YmEiaD2K8ZEtljAjQvMJlBa6946EbDVyL6uSQRh+gbLpczdZ1y6G3xLfR916VFqYBtPxFkP0nl2dHUaKPhX7x2AZCkDrPSIrNz/fjPoXxb8nTCNiSplqav1nUzv6i1GNTQlUJpk/QwasDRzvwywELXwu7XkI4+g==;25:TF37RRQ+Z7xhaGOrRjjvf+VctipNj/b9EDilSdRvDzgsFKXrVL+mc0Qh6RVOBhruBwsTrDNu6uySe/bRXYizegA/FRyfrMR+DOnoZXKcMx+iULO78S+a24uTKBk2Swc7kzYm0bEVtnLAg3okPSHZTvBgIjv/ym72nO6afd/0a3RWig6MBEiH5At8+d5a8b6M+E/oiEHJepf/J71TISfPHlsMrLOdOLS3p2AFia9AiJ1+b6QKApbNNAk3qhTTMc9np24SYZHx/TzbCtDpiQNgQ/xf3yKQZB2hDxSzQSpueSjXz/lHr0CNheJFk8ffj5hAhzlo0zdcYY/WwxvjBeKfaMV9nLiTY6EWP2rYQlij8dtNKxATUW8bEsxUB6mMnr2BE2LWFh4XkwTb1sLjPfNF000TSxdf2MGeyRqQGLL7/iHAs4w4/z+jUwUW/BkdXZKA5uE2CA82sEucf6seFwqwDYKetk+0IUQtMq3AxOu8UvI= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;31:fSHceaBRwF4JJn5R3CR+EMbA173ygIlu741uP8h5WNNSK4Opbl2sHLKHrriGz2G1U40AfXLHO4DhrYZ3WUnvTUBpZvBgBmQWOFPC0ngit8JIRwI+As+P160ROI3lUmQM7546it08WPGWj53idUG0VogIgibXT/wMXWdnLjMfHhqRPS/gCGG+RynAyk9Q9/kXJEZ0xWbLyewUUM2c9IYZwnyUaYdBHbb5gnzzYe9FNA8hyS8r7gHntT7uZlAkSNrc2ap1BPtOz5VJ9zHRM3TNdg==;20:KYiu7JlphMmPypWgSOPJJN5XRNSE7rPBQtJmOf+6MfQOA+x+6IXZSerJiKekLBz1OGCrdUV0xwaqKarsdCTt+QLSC4tjAvt3/iHPtvh7wfBlHrbzF689RQ7oW8NRvqal+VinnYXPRA44wM1FP5If74/M146D2C6sc+jWJfQY3pY1gmERaZoDWWOWKKLrRbIuimDe+OChZhT6uIPfA3g/M044IuXGc/y+np4vxs+9Uwvr16c9BhZKAsbZuC8g2ye2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123564025)(20161123555025)(6072148);SRVR:DB3PR02MB234;BCL:0;PCL:0;RULEID:;SRVR:DB3PR02MB234; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;4:j4fKMQSodmFPw2eE4S+/VtQA5YEgK7NVC2JsTVa1G6w5s4fQAic8nwyjecFKffHEkE1Y+shmyC7lKkStCdbzUUCax3dy3LkeidwP+zhEDprMFlly4TjbfQCxCVhnub6bPtJaoSgGzUPhp/vxj5CmbvRm1hOIeRyTXkW8ub83lpMliMUDaq77UNfoaYw/izDIXc8EAnpWoyySp4yyay6OE/7Qi+s8EqZAhfYg84c9o+aKao+uaY2P2nOTf62aeYNn43cz1mlZahnN1YiKOZYD/eW3Q6rNbIOnAp/YfuzuptXFHCa9LgL6+O5CxRfDs6Z/o0ljJTsfTG5ki0xUo6I+35dyKyjYIaRqJZaeL+tULW0ZMxlY+YmzIUIkz1K8WdA4Rh2UvYqb5yA1tamidihrzRroFU8DohqJCTDo7qheBSNyikRaDn0PhUbXcTG+tQUPTjVQ5/JAwrDvW6B5sSU49Pe5uhSg7r/i2JOuFAygGEiyiuTooNOsZePpDs8YXlemKuQNHR0WXbby51DMPria27npBr2rLF6UdrejmalQs8S37GE5tz11CJ4ydohCYZ+1CsZNPvnBftJcC2gweL7a9mWEp7jQu+U9frfwdBDnfz+slJBwryylY2ps5PLH0KmQFeGKAx4mV8x3bqyPoK+qZ2/XFklA/Ac9ExxNkMhNeH1JvsBgHkYyLGXlHiTVuyWPiBiJ/k8ppQhSucau4Pm55AVlxwBg695p8i54/16HO+NpQsgOiV1tVjUM5Uee+kNr9Gp3LWuwDy9c7+SnaQoa8XLnJ6QevNS8MzrAdiDLlaY= X-Forefront-PRVS: 029651C7A1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6049001)(39450400003)(39830400002)(39410400002)(39400400002)(54534003)(377424004)(305945005)(8676002)(81166006)(64126003)(54356999)(36756003)(50986999)(7736002)(478600001)(189998001)(2351001)(2906002)(33646002)(74482002)(31686004)(53936002)(42186005)(6486002)(77096006)(47776003)(5660300001)(23676002)(6666003)(6916009)(31696002)(83506001)(25786009)(3846002)(6116002)(86362001)(4001350100001)(230700001)(110136004)(50466002)(38730400002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB3PR02MB234;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjNQUjAyTUIyMzQ7MjM6R0k4K2g0QjBlWk9MYk9ZbXVMeEdnYWM3Ry9q?= =?utf-8?B?aXRRbm1uUkZ5RjJNeDZ6RFFneTMrNDJ3NUdhNzdRemFldnZ2YXBaOFNpUXhX?= =?utf-8?B?M0J5bDlkZFZML2pKcjZnU2ZFVXhVRGRQN2puQk4wb0FnakU2TGlNdU9LSEZO?= =?utf-8?B?Z3orWTM3RngwTFdXYUtkNnU2RWpJUHpuRXRzb0ZDRkQ0Q1o3dlJtM1dwdXBm?= =?utf-8?B?RGhYY3lkbHdlTWNpSkV1cytiUXN6QmMzS0c0ckRxVXp2MXFvNUY5WVRyL3Mz?= =?utf-8?B?OVpGTmxuTEtMd0UzTG44UUNCQzgyV01ZTFpzYno0eGFaamRjMzZHYlJrdUJG?= =?utf-8?B?eTNqdVpUM2RmdzNyd1pDWEU2MngyYzlISHRod2ROZHBTcTQvUEppRTVCZkU5?= =?utf-8?B?a0RuN29Nc3QxclJqUDVVdWtaSXhoWHJUY0JwOFJLeVU3akxnUHJ2MGhXZmxT?= =?utf-8?B?SVQwVWIxL04rOTNMc0N6NW1RWnJnTjZ3dWdxRW5FL0VnbkQ5RjNLeDluNGpT?= =?utf-8?B?eUU1UXRqYzJjUkovMWovOVExa2dqcFRmNE9oRnduY2o2S1duN2ljbjRtNUpI?= =?utf-8?B?SzJFeGp0VE53LzNyNHJSVlZDbTl5Wk03Q0FKMWRIaGJTY1N4WmxpZ1M0NWs0?= =?utf-8?B?VWRUVkpVRk5WM1hpcElzRERwekRKUFRqdHhjTEdMallCSCt2NFBnUXBscTBz?= =?utf-8?B?cTUyN3VaZTZsS2dUQks1cTBNK2dyWE9od2dhbkJFTnpxRXc1aHBHWG94WmxW?= =?utf-8?B?UzlSUzJya3JoaGZEVk1sZ01MQlFOZ29lbmxxS2NNY2NRZDBYTmsxVGtoY0ZU?= =?utf-8?B?bUE1ZjRpbHFQenRGZjhZOWNUTVMzenZTYUlkOExmOGV5Y0tqZVNUV3IwTmcw?= =?utf-8?B?YitnaGxZb3BUQ0ExSDdPdER5SkE3UlJKR2dPTmFjZXlzZW1OcERIT1lhQ3A0?= =?utf-8?B?a0k0anJ3czV5cWcxUjdrdlFPYmJYZmtCQ3hFb2U2OFFnOVVnQ0pBaEF2N1Vx?= =?utf-8?B?SmEwL1RFTlBXMml6Q0RjUjIwNFVtSStISWltQlNrZHhOZXBheEFhZnVycmdr?= =?utf-8?B?NExReDhNNWJHTUxQMVcvb284L1BuL1RTZHdXRHFkZTNFYzV6OUxXZEtJRUJ5?= =?utf-8?B?V2pGOWdvOHpqU2xZNDFVS0NOaHUxSzdhM0lGMVNWVzlSMEt0NG5iN1ZuYmlU?= =?utf-8?B?Ymp6SWpiT1BORUxDdDdXRHRVM3VCbkU3eklZcjIzTlJVckhxUXllUjRWTHdY?= =?utf-8?B?aU01WkpvOWphaGVqZ2ppN1JRWERqSXcyQjY2bEdUMkFITlpYNTRmMjVXb2ZH?= =?utf-8?B?YlplT01Hbm9tbUNPS0FCaXhUeCs0UGY5NmdQRGRHZkhubWJHVnhIK21WQzNm?= =?utf-8?B?UjgzR0Q0ZmFpWEgrZDdsK2pUUFdpMjhXSnhjS1NScjNlenFTMUx0dUtFc0N0?= =?utf-8?B?MTA4MzBXNkRGbVhJdkJrVmRsYUtPYVNBSFBSak4rNWxSWEZGL1ZlOFRUVkZz?= =?utf-8?Q?pWNC1X3WDxe01X3Nz5R5DZeI=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;6:UHIbXloOP08SzSak5XtT1ygix8TUQfus21X2S8CDHtjcyRn0jGOT++7xljxetwaprK0kW3z72bDkBJOk8R/0wydZZQ6Zbt6s6NdqQf1wFH4+JE4llY5sH3g/u7lb6D5Rbpz/LJh3vz4F/aYE23vHl/ALTV2xVz6dDRRFI7lf0sY2FuD0tjm2A1yO9cV6WR+jgQOxpkwpyMs4cEBl+cuj92Un8QfEsQHzYgRWn1cUEPuH7ygxke981I20bgsWGSLZq79vDkL9iq8ybTTu8eVLRMbjyjgXjx7m8nNCOVF83QPZFp+NxLxdZjt1f+3R+NqY5EStyJFRcl9GsYf+5P2qAunnOrFFt2ClVMwDPX29AU19xWU3a5dX9HEQdfEA8hWMVk28E/uiTxdCnHYFl1RbvLz2yUvzRQUEjuO7psUFe7CMY17uijJ/u3U9Z27dO3gnOlrfBg4qYVWnNubhSsG8xC1QwOJJaIyHgwzIZUQiJROhfLsNLa/0FGRnR9CfxFhIGMYvK4I0d5KsO+/j/JpdDw==;5:JfHOfa53vt+4kRkHq5iokHbxC05S5cnJQH+Kq+FVSKj2Jzkp89ZsMrf2HY86L7xyA2CMQzPBk4f99GBpbVPixhBs2s4M4Z5fNTFU2ZIoiGk1T6Rpaqgt6Vv+3EF5926L/LK9sxFeX4a85Zi9vKEYFbPie/wBDsGcsSaIVu6gS+g=;24:7cV0RuDeqwWgw6g5FxsYC67WCgzDB6Mr6iXzknoq7kj9f+lU79YN5ntR66XWj7YsR7JqCpBAyi525K9s4eCOoN4/wTkCjg6aIRF45eXJTDg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;7:mE8vKTh+d4EuTW+SPk/3TZlv5NRaWMaR91EDLRhKlEGQ3Let6YV/HID35EHSf5EJzSzigTZU0u/vewJ21EpRLG1l59av2JR9KdTMfwMTW5Lmgi1x2gkwRbrca9Fx+4SfJeb71FSWMyhHheqN2pyk+gfsIUMw7Q/xIgfPl3ffTz1txkLvYhLputGpKu0WGZCXozKzbH0h6USNVDAT6lmYGAsM+EyIZWUFl86StwET6dLeVkGfeYQWKDOFcXesjOrkDrJFe0vHkIkZNr+bOGeU0y8YPBYSLqNXgAn6MG+aBcs7O6lRWiLMHqJ9/bvcRguCG8xTIuWfkysqLzyKVExLFg== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2017 16:32:45.1772 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR02MB234 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00149.txt.bz2 Sometimes _POSIX_THREAD_SAFE_FUNCTIONS is still set in this case, which in turn leads to build problems in getopt.c (which would define the functions to nop anyway if it knew they aren't present). Signed-off-by: Ulf Hermann --- lib/ChangeLog | 5 +++++ lib/eu-config.h | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/lib/ChangeLog b/lib/ChangeLog index ecc6179..58ee43f 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2017-05-03 Ulf Hermann + + * eu-config.h: Define flockfile and funlockfile away if gnulib hasn't + detected them. + 2017-04-27 Ulf Hermann * eu-config.h: Define attribute_hidden to be empty if the compiler diff --git a/lib/eu-config.h b/lib/eu-config.h index 135803e..e69b213 100644 --- a/lib/eu-config.h +++ b/lib/eu-config.h @@ -198,5 +198,12 @@ asm (".section predict_data, \"aw\"; .previous\n" # define COMPAT_VERSION(name, version, prefix) error "should use #ifdef SYMBOL_VERSIONING" #endif +#if !HAVE_FLOCKFILE +# define flockfile(fp) /* nop */ +#endif + +#if !HAVE_FUNLOCKFILE +# define funlockfile(fp) /* nop */ +#endif #endif /* eu-config.h */ -- 2.1.4