From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 63195 invoked by alias); 4 May 2017 08:53:41 -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 63175 invoked by uid 89); 4 May 2017 08:53:40 -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.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-25.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,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: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-he1eur01on0107.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.107) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 08:53:38 +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=prz+oWJubQYcVXNi7JmoKLCpbdnAVOTEHcSK6ICRJ3c=; b=jqSRp4VDx9wcib+IIfktaL6MXXJfuFkn/LrdlxDnQ4YHyvVWLYbSYmOduMU+aEpF7glRA92cdbsFX4B6VGjPt6uaB8zDIqkzM74u9h/mlO5qnaPlf+T+GfSjOSW64bgHF4ZDFaG9XFeoVpWc54nTHfAK3ILMyT+rIXDhZYYkrjs= 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 AM3PR02MB225.eurprd02.prod.outlook.com (2a01:111:e400:8810::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Thu, 4 May 2017 08:53:37 +0000 From: Ulf Hermann Subject: [PATCH] Add empty features.h replacement To: Message-ID: <2773ac72-8651-4d17-9e40-77751b951399@qt.io> Date: Thu, 04 May 2017 09:10: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: DB6PR02CA0023.eurprd02.prod.outlook.com (2603:10a6:6:15::36) To AM3PR02MB225.eurprd02.prod.outlook.com (2a01:111:e400:8810::11) X-MS-Office365-Filtering-Correlation-Id: 58f50385-274a-406e-ffaa-08d492cb0e17 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:AM3PR02MB225; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB225;3:Pe+F0ZcbPdG4eEDjUCJbsVPbUK0ibXw4RRgvm4zrMEbtk/7Y8Bfz1Zzkv+AEq+j1TceElqvwZWEo44ik0I/gyNfVFnrhTPOHZughrXtTUn1W5TXBnk8ZijH5rywJD7OXEIqntk+ey9/ztiieFj+yc58TCUFByj2IXFsM6XFuC6Pu9hpPsbNZJBoD+pmNwsQcVJzDGoAnEt5VljkwVdsR7jrNrXd71OfjFDEJRZdPFQhCVnpCHMUURiAnQpC3KLD5C8KEheLU/AvlYeAMnrN8svajNddoLLNhb2qb45uJJ8hMY8dA+T0ze/2/coAm+omh6tq5laBxlQpVucgJcFOb3Q==;25:RHmMO6aC9+10v8Wqkrf2EphrRXMH2VkA1aiTVkaJHDsjK7/SNFGa5UinYlRiMW1xmkLlJSTEsSwcZ91dgBGB+Al7nTO6Cyad9qdnGip9bq/JzJDRV5b+X/OyfJF0P/3UTZ3nWaCsp5fr8qcIt7Yujl1YMKKOFu4XIIJPxKuAmfapEPXwr7OZ1V118/zzJnJ9ByeWaMuARCqVzzted7rZ6uFEW1jyV4dkyyI8HyJlsVXcOafJMM89tw2ueu/2lWqMPke57shV5amwabbz5VbRH5Pr09mLiAXIewwUYCxdkAeL7cfEX+17oS1YVhKM+OGY7Vy8KIlTKMjETRJMf23/VSzJ1w4kCSNugWuBk785oWHFWRoL8VMErULis4MeDPnTSzR5bS8EpIjaF4ZVhgb+L1oAAPbIdKbWxvGPch0OorwiY2NK7nKiRqqvJsvBB4n7GhuVKJFslIazGYlOp2lWsg== X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB225;31:IeJ64DQWxkJNg9MPBCdZkX0t/ujoJOx46sfG/YHFYSP/yI5SJXLz2AhhnFWE9TpLebTchUKweWRnnKJmMyRV+qHybRjqHt+b0jpNUTq7Wn2QaRCb2dwwJ7Lxz0kTrBA8nfcCGe5/qiVstMIzXn5pmrLd7Tbf1pCFVoPmofVPxg+o5+EbngLJCoB0Xkw70jzuDkd1LQXNvA8IrqsKNXAaeM+xWxnxHHq4Lm+xjvKb8Bg8Bnfp6XJc4DVKN2EJCXLvMT6NVI1JaX5T7v7zXqw53w==;20:IivJI4car2BqEkrkYdw+nF5/pKxXAnr5PRoECjR0T/PM+44EXCLwPOoCVodDvMNekwRmsST+4kQ3yFXjAg+pUID21tiWYvwpdg4bjlhOK7FLfjDuhc+V/ASd5TmXpiUDI9PzwaXJ1Y0KQegJ+rBlj+Pns1THWJzhWtfegCn/JDe9JkI27JDduAizDXAe+EHaBuv1XZikLCSD6TWC3E2evqcQdw+ZbOWrFFFssj57LeoGSYDya1VVAaexs777sydn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(5213294742642); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(6072148);SRVR:AM3PR02MB225;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB225; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB225;4:u8U9fBH1Yoo8MVWUkcImTvIKmFvbEHuM08YVVdE/iOIWQMTcSMKVG8ICdtZ++GyNEvnuCsGaLo60/r5pZPky3IF1FYG7OKoFhFKbJ+m+mHbeiocdP9QxFhDMROc5E4FVu2UjBcAkPa2gDlETDyJjiHPpLm7BjFCBA3h5mnKznsHxpRA3vFDzL43Q7lviy9dhgJrhE1NU72Fau64pyxazFa99/0rakUkIKoyzdD9MvYaKRy7fx0+R/S9db4YR867GhilWt8Fk3gAgVngPt/NvkGZaWfN9Yee2M16qxgShYGyOvGZi9f1LQ6Xmuuj+o3+jEpg5geW6vXLKTXTo1fxAHbqLb090mGetfQFxK66DJLUniAQwuGBGOt7Q5FO1jwxPeOQh/kXVcpIKb+Kb+GJdje4sV9baAUk4QptBQO95IijS0djEgI2JQfF7E2kvlQlSVvI1qczFyAmXniv05x0A/ujHJgwZMCL3CUQzpSopMeDIErJoYgwR0sObU4eml09Jk0L2J5EdRprJ/rGFbcsHhPMOWkzEiCythJrY3xdZmS5sOaOjTI4qwVwlmJ+PvjLO47wRGQsDjq9zZf67XF7iYxbrfJdrAcmb1vmo2zEY1v8x6EKOMkqiYgwQl8Def7CLIATV0NuVFYSgZo3qicrP2Z2XIPa6adn+F9n0iCOZrZPgzmkIIU0Pd9cZilLg63Mi4iV1AdHrNF9ZwVju7g6W1GIl3SVMwlZi5/AqUwmnf3ICYMrOQr+oj1h5llR/tr8YTnXQ/pGYNxxyV/ObXMUvw4/wRT1Si7IcJKoZ+SBc9IlZp98OyFoUh/Rm1A1ypXFFbGhaAVPoZHmZQJl0NsbiJfQS/jRhR00LCStNP+wcTQB3UkMYS8avZyVo+N1ADaxcKKkAtzCmPSOk0j4vnBDB5g== X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(39450400003)(39840400002)(39410400002)(39400400002)(377424004)(31696002)(6486002)(47776003)(25786009)(53936002)(7736002)(31686004)(42186005)(66066001)(2906002)(6306002)(230700001)(2351001)(54356999)(478600001)(50986999)(23676002)(65826007)(77096006)(64126003)(38730400002)(6916009)(33646002)(8676002)(6666003)(5660300001)(81166006)(4001350100001)(305945005)(110136004)(36756003)(3846002)(189998001)(50466002)(83506001)(74482002)(6116002)(86362001);DIR:OUT;SFP:1102;SCL:1;SRVR:AM3PR02MB225;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTNQUjAyTUIyMjU7MjM6UDJEdWtEbngyT3YrdHhCazlSWTRGUmYwVkhD?= =?utf-8?B?REp3NytCU3RiclZTd0FIU2RLU3c3dmdDMnIwRmJ1Z2VoZ0ZWeGxPdmkvUDNw?= =?utf-8?B?VjhweHowQk1SeXNRdFV2WEU4ZVFkaWxoazR5LzR1RGhKeFBZL2Y4ZkJRcTFN?= =?utf-8?B?WEFwUWQ2VHVJbVpjYmtnMzJzZ0sxVG1IK1NaL29PYWRvVHlGQTVBd2E4cFNs?= =?utf-8?B?d0xyT2wwOU9VOUI5emUrRVkyR3kzMnZIY1dFbVNpcFA2eVN5cWFxck11WEQz?= =?utf-8?B?azhqNDk0QzN6SkxvdjlqalFiVjBHZ3hlY1Bjek9PUU92TWJ3b2VNN1Y0dnJh?= =?utf-8?B?ekxMRk00WkFScy9Bei91eGRVTlBzaGt3eG5IZkQ4SVRESzdhNTRVNDhzREpL?= =?utf-8?B?U2ZFSUZrSnpjdFYrRmpnL3Z0NDRWTjZ0OElzNGxYSUI1ejNVNmFabFlmcWVS?= =?utf-8?B?VDBMZ0xOMmVLUk1YY2c3R0s5S3BBdnRTRXByaERLZ3IrWnZHYU5iNS9hQTBv?= =?utf-8?B?WSswV3BVZGs2T1prSHcvQlM3N0h0Y0QzNUt2OW5rR0I0SkJoWmwxTEFianE5?= =?utf-8?B?U2hpQjVGZ3l5WC9GZW1abC8vbDBLOWhWYXFxMnNrZXg3dHRleWU2NXdzYVFI?= =?utf-8?B?MURpbzUybUl5bGU2NVVZeHRadWxNcjFCRytJbHFtdkpYeHhKekVtSEZCQTF0?= =?utf-8?B?K2RVS2tVRFNWdXBlRjBIZno0MDlrUGdteEdFR1FFVmJ3OUdRZ2tBWWtPNG01?= =?utf-8?B?NDdCak83TTVWc1BUbmJLSmwrQjV5WGdoYVNORTRnWjRVbGFLNzB5V3hSVmo2?= =?utf-8?B?ZE5MM2luc2ZlQjAzdTdHYitKMjVOOUh3UFRlaHB4UUwzdGxTT1ZLeEtObVo5?= =?utf-8?B?S1lBOGk5clp0MjVTYnQ3bUs0NHhNNUYzRFV4YTd0YTk2dnk0b2d1UnhXQXZN?= =?utf-8?B?L3U1SExtdkpudnQvcDVFTmVZMUtkem1sNVNRVm5hYnJiR25sRmpqVFMrZFpE?= =?utf-8?B?VjI0U1psd0MvWVBUaWduVkZVU0JndUZUQ2VoVHUzTjFMSUhMbktQMjlBSUxh?= =?utf-8?B?SzMwWit5WFdPSkRQa1ZCVk9MN2FqSldnOHRxOWYwVkZSVUVDRi8xaXMrZld6?= =?utf-8?B?ZmxoNVprU2dLRXZ4ZlM4a25PWnVWOEgvcFBrQy9DL1RjZHpVdXNPbk5MK1JH?= =?utf-8?B?Rzd6ZEUrZ0cyWDBiZExEeldjQ243UVFtd0JjVUZRaTNrVlcxYytGbnBGUVkx?= =?utf-8?B?YUtyUkNQUDRaSUs0UFhuZXY4cWVGUkhJSEtjMkowMnBKNUc3ZDFjakMreTJs?= =?utf-8?B?d1BPMFU5UkdxYUZJS0g1WmZ5R3BjSEJzajd5dVJCRDhBVzJOemNVYlhZZnlJ?= =?utf-8?B?UzVIYlVhUHBWVWg5ZUVvZFpQWXhLbXViSXFpbE1lOEt0b1ZPSUc1c2ZLTXZP?= =?utf-8?B?MnNWMkZld0hocUtzazc3OGYrQk1jTWVOVUZKOHRaVmNiMXZiTUpjenZQVERH?= =?utf-8?Q?igCaAalBOc/aSFrBQssHpl+l0oR4Bji6QF35QHAmmDPwv?= X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB225;6:qJuvo0IKjpQW7Ziac9AThThAzQvp1JbbEodbLmsHgqvBIf7l+77fX1IiJfuNHClxOQCuRMlLFIWPeqANBpYSmbgNqQNoSNR6GDISZIlkupW+a4NZs7mXqWTmaJ0XO+IWYOjeRW5udTS38IoKUlXsLQV5d+Jiz7HeGK6F6SIusqoXs8+xswmw17KSXPE9+gqYuliDCkmUlBAZsKhKzlf8ISdx5EK3G1qp/ehwvNQ7MKmHFB8+tisbvblg9LmOjlEiQDLxwDQKbAhquoUoNlwKd/Ii/yd9AdM/ozgbvyrrXChco5mRFehr8NoC1rI13MagR2AIUBYrhzlpGA5xOkXuHa9sPQJ2WdhjGX2GuC3ar2YoC36UrFATBsPfKudyLbq22k6jqsq+i7ll6b9OTeEyjGbV3dDUypPYI5/1H1XJMjEeXX6323Qz1isibKc5mwdIx8/oPMfeRSQRwsW3FcDiwD/btVecUq9WiZEH48ZEourh29lAYRPNDOphCNx/M+c8xk5j7QtcYYuduirEXChXdw==;5:0pNaSzaQDnIOQVMTANaYQSAGGc2JlEm8oZ5+iLn62T4y1JNUNy6ZB5OScKQZyfJIJhZ3hJHly0EvQfQMYFDcNLR49xdUiq2bQHBdMvKjJn5e6jnOEe/jE+uFO6A5twMcjVCYlieth07mrnI+oWAIqQ==;24:i+4L/OPVZRHQauZuHImaCFEkWUdcJcIZxjqHbGT84NuZ8hXnwbxJ9NWRRGFb3dE9J44NwuvqtkYeFf7hg5mf2z5c+983lDM/IK/6zMZBkpc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB225;7:fp7vrs1SFaTXiJmEXmfE0gvjs5uQej0NTi3gdRgaNJZsPlh7Vrw/Ekxaj3cIp2SyuAbzMn+oRRmzz4Pqm6oVWL8p9dU1HC9F9c84F0zgSMFbh96t5dHd+r855EgvHofS7msCiQYnDTgzQchsXlzIiEPajVSPDddLfPu2U+gwAjzYvAG+raN8+09kr8fOfqRYuduGG0RJ+gMbJz7gNxVsyfNdLL28b7O3rFeRG8n0z09EcGQhsRquX09a+N5e3hj/BM2l1evQQ+/Gl4r0c/8jdsHeZXzvv96Q354q6GqYjZ2iVJaMXOrODldNsMBdt/LsgrkDblwSeyhLe8lIlZrYyQ== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 08:53:37.6931 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR02MB225 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00157.txt.bz2 gnulib #defines all the types we need from it in config.h, so it is empty. We still need it because other files #include it. We use this for building elfutils itself. The other features.h in lib gets installed in selfcontained mode for other projects that include elfutils headers in a different environment. Signed-off-by: Ulf Hermann --- ChangeLog | 4 ++++ configure.ac | 3 +++ libgnu/ChangeLog | 5 +++++ libgnu/Makefile.am | 10 +++++++++- libgnu/features.in.h | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 libgnu/features.in.h diff --git a/ChangeLog b/ChangeLog index 814a133..4024550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2017-05-04 Ulf Hermann + * configure.ac: Check for features.h. + +2017-05-04 Ulf Hermann + * configure.ac: Check for ar.h. 2017-05-04 Ulf Hermann diff --git a/configure.ac b/configure.ac index ba560d6..fc5edf8 100644 --- a/configure.ac +++ b/configure.ac @@ -580,6 +580,9 @@ long sysconf(int name); AC_CHECK_HEADERS(ar.h) AM_CONDITIONAL(HAVE_AR_H, [test "x$ac_cv_header_ar_h" = "xyes"]) +AC_CHECK_HEADERS(features.h) +AM_CONDITIONAL(HAVE_FEATURES_H, [test "x$ac_cv_header_features_h" = "xyes"]) + dnl Check if we have for EM_BPF disassembly. AC_CHECK_HEADERS(linux/bpf.h) AM_CONDITIONAL(HAVE_LINUX_BPF_H, [test "x$ac_cv_header_linux_bpf_h" = "xyes"]) diff --git a/libgnu/ChangeLog b/libgnu/ChangeLog index 3d30ce1..7d70bfc 100644 --- a/libgnu/ChangeLog +++ b/libgnu/ChangeLog @@ -1,5 +1,10 @@ 2017-05-04 Ulf Hermann + * Makefile.am: If features.h is unavailable, use our own. + * features.in.h: New file. + +2017-05-04 Ulf Hermann + * Makefile.am: If ar.h is unavailable, use our own version. * ar.in.h: New file. diff --git a/libgnu/Makefile.am b/libgnu/Makefile.am index d7af59a..ed8aff1 100644 --- a/libgnu/Makefile.am +++ b/libgnu/Makefile.am @@ -35,7 +35,8 @@ noinst_LIBRARIES = MOSTLYCLEANFILES = MOSTLYCLEANDIRS = BUILT_SOURCES = -EXTRA_DIST = endian.in.h byteswap.in.h sys_mman.win32.h mman_win32.c sysconf_win32.c ar.in.h +EXTRA_DIST = endian.in.h byteswap.in.h sys_mman.win32.h mman_win32.c sysconf_win32.c ar.in.h \ + features.in.h CLEANFILES = SUFFIXES = @@ -60,6 +61,13 @@ BUILT_SOURCES += ar.h MOSTLYCLEANFILES += ar.h endif +if !HAVE_FEATURES_H +features.h: features.in.h + $(AM_V_GEN)rm -f $@ && cat $< > $@ +BUILT_SOURCES += features.h +MOSTLYCLEANFILES += features.h +endif + if !HAVE_SYS_MMAN_H if USE_WIN32_MMAN sys/mman.h: sys_mman.win32.h diff --git a/libgnu/features.in.h b/libgnu/features.in.h new file mode 100644 index 0000000..41f94a3 --- /dev/null +++ b/libgnu/features.in.h @@ -0,0 +1,35 @@ +/* This file defines uid_t, gid_t, mode_t, pid_t + Copyright (C) 2017 The Qt Company Ltd + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify + it under the terms of either + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at + your option) any later version + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version + + or both in parallel, as here. + + elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see . */ + +#ifndef _FEATURES_H +#define _FEATURES_H 1 + +// Don't define the actual types here. +// Gnulib adds #define statements for them to config.h + +#endif /* features.h */ -- 2.1.4