From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127771 invoked by alias); 4 May 2017 09:10:49 -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 126787 invoked by uid 89); 4 May 2017 09:10:48 -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: EUR02-VE1-obe.outbound.protection.outlook.com Received: from mail-eopbgr20107.outbound.protection.outlook.com (HELO EUR02-VE1-obe.outbound.protection.outlook.com) (40.107.2.107) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 09:10:45 +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=MPhqaRri7hqW/rVXI+mbatblF+KXX4Z92RjCcBd1ra4=; b=cIWSaYapaR5yum6IFM3vn1lr+kdI0v9hV9jlTIY2jjH8g1vyfvPqM+uFQK6GWctzxuOU9CLRxwkH/FAo7OYeg5HeTpsI2+9uUT50ExaDuZzyPmbE73MZXG6qTWsvgrA2KEn702MvIRsCDhb2ebeAfuofohdsI+NGokkRAQlwmG0= 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 AM3PR02MB228.eurprd02.prod.outlook.com (2a01:111:e400:8810::26) 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 09:10:44 +0000 From: Ulf Hermann Subject: [PATCH] Wrap gnulib fts_.h in fts.h To: Message-ID: <7274df1d-c3b6-c3cc-b7a7-36cfd6aca5c3@qt.io> Date: Thu, 04 May 2017 09:36: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: DB6PR1001CA0005.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:b7::15) To AM3PR02MB228.eurprd02.prod.outlook.com (2a01:111:e400:8810::26) X-MS-Office365-Filtering-Correlation-Id: 9c2ed9ee-6638-4d71-4a07-08d492cd723a X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:AM3PR02MB228; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;3:UWcrDK/rc9kTZVLTNLmzRQ7onHMHVkOvGGIxE/KWzaCpuKyhjl9QyLe99eOHywRrLzKxyKiARqknTAJxlFrweJnXh0nn/q+Yr3VFwbbZEpusDlY/cc/jXuZKg4CDeagbR5EYjBFYcHxjxusRYWPPxauGClGOQ/3XLiGl9P8QpAdDiuwJ1yO9mQDPNsf1etBrLNeR+EhG/BAZce3LbK9k6hPVW7INSRNVqvr7X/5QCHs51krwITCHOxQP+DqTuBFoqNPckhpeJalXuNqUD9gkgPPCW7sn6ijDkP0KKhvPRFoD0Cf1kunKVVCLH5eKVMaEf5ZjJVKqA6fEEv9wu2iCSQ==;25:KQPJhjln9NpAwPXxPjIIaju7KeyhkmK4xkzik1X4MHRkxoSXUNihR8N5+IGmIPG3bBu4qCd7PLkgxJZEESP+pVk8FFcct4/++4Qt9vxve1JTS2u2FsnRVdynMYtcdYDIkblAUhLO2FMM0fRTtgIuIJlieLVm7yha2oOHizAOhuouNgB9NdBggT+XggyJ+24Gr6H1O17MVjbM4w9ZWAMsi1AA7DBcv4+aa72Plkj5m39t1giIcny3OEx84Bn1r08JE9W/BTIqyvrKQUYcKIyrgUIO/SHLkJrGhRwwxoY8QC2eW5pKwgYDlWFkA0ejnMVvdMTfP9z+PiQWR4tzhb3+yn63CUlXrWFJoH4HJ/XEaXRGiPVd3VIt81qAm94hhtWuSzdyEdKwy+BJAtFBL2sdtUD9gXZ6Wp8yCMAQHLWTZU5Oea3EN3+7WOImMHUnWv80Gs281TrPJ9VsWg0lzl+aYQ== X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;31:P5c1zPUV5hpw6u7+gE1x8/TSnDPAvj1gxxJByYTU6919d6CTucjO0naBq8vqnd14qPejI6GG+BMRknRFWKtoaTG3RFjV2/mn8dFV8EOpSXh6kYh7aKZ7mlS5cmbYzcDg0SYGGnIS6cbHgIN+KpL/e4cACD25CiRv1hwJnr8CHyoIHmtfE1q5+aXIfSwttk67BUR4hyjTDUI9TiZxGoC6Z7VtZBmIReHmq3JMD14A/Hq/3p2m2aVvj94qkqDGwtuwjEtWLQSiY4zFNRUeOZpAxA==;20:53SSpeq3f2zvHDzwjsy1+NdbJ1MUvpFnHW62uwcPAFONpNKYhBcbfFRub25TTFiRZumMzOagHrsfFCP4RTl0RPc/qNWRw8joCAgI6vTaUkHt/ZdyEL0PeyUwazZYG4D07szf2woD8crgQqmMpfwlvVCFQevsVpV4bGoQdzzgKRi8Ae6ArVQppxvc4+c9+2Pe/qQhBvty3PAZscPbK0XuOYh1Gq3ompNvFTLGGKNo+fZGo07c2mvszr7hzKi5RfwV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(6072148);SRVR:AM3PR02MB228;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB228; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;4:gBsnwOHGaQckKMKcD3ZLbVL7pRQ38MgtCIEIyQCSCIaZjjMzqPEbtFZYo8kZ3qUFEs6XDLf7U2JJKtJJ+7oQt6rmRV95W9H+Oa71r87CyaM4ncUKoOBwB+Gxy/YvtbPTLw4DJ9PNVuVLincgQCfQB/F2/EDx1/He1Q1adYwTrulktTFk5ne/Ju6jTp0uJTjZJiWJO4Jk9lNM3eqd7CZTp4nf5zpvZ0EIU0AVayCJ1AAJG8Uwjbdod1cfi7EhltGE9FcH9iKKEwloKedouEiiMTp5GAqM9UpftoEIcy81bkKW1EVb4wZ19vVYRLQHy4OE3ogdE6C23yLsQi5YJojveAmcJ2SVopgUKZTNKA4+u6zMHYxK3iLJLKExMb9JkpS5k0VZrd+kYXO3WrSvEUJhW9Fvy5/SIYX2yvlk7j3iNyJiEHqmRQFivMoIlRK/MuWswocQf5bWYUIKzF38SUhbZxnkFcn+wmrcK2HDyCLHhyvO0We/d0kjqYx7m/CrFosPs+r6GEJFdMqDXR5hf1FcindsEbS6IHw0ZF0g+Zh4aC4kaDzlLM8Cx1mEpTgxJ/JhEJse8PXZYkRqfZy2qWTUJEvCLl7Wf+FTAybY+Lh3zyNQqPHYfTiCFYncfoPAiiTPK5ix8t0uwT8tx1wiEjuLZotss/DbCZTGX/MOlTiaB3+AUr4kL7/cwpHhDdqHojilVxqbHX0I0tE9eR7eqJ4mpUeVAr/m+CyOdFJwOOa34MNnf8IUgN8/sPyEcO0q3nNPoOxjDB3rC/8MpXYHNbmtxryfaP64sZa36AtNpBcwRRZzL3s+s8uV+aFfHnCEMGgujuGCgk3oL9HHdJm6x+Ow40fcXopR13Ra0PCcsydnUAY= X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6049001)(39840400002)(39410400002)(39400400002)(39450400003)(377424004)(2906002)(66066001)(189998001)(6116002)(36756003)(3846002)(47776003)(2351001)(4001350100001)(5660300001)(23676002)(478600001)(74482002)(54356999)(6916009)(230700001)(8676002)(31686004)(110136004)(33646002)(31696002)(6486002)(77096006)(38730400002)(81166006)(6306002)(65826007)(7736002)(25786009)(53936002)(83506001)(42186005)(64126003)(50466002)(305945005)(86362001)(50986999);DIR:OUT;SFP:1102;SCL:1;SRVR:AM3PR02MB228;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTNQUjAyTUIyMjg7MjM6dVhZYllEUmNtTENoZmplTkRCdVBHbUZ5M2R6?= =?utf-8?B?aDVEZ1ZyZ3VVbjhNb0RWYm53TEdjaGxUMFZHaWJZYjlXMURkMXB6NTc0RFo4?= =?utf-8?B?RFJlRVhqNlphRjZBd3d2MkZ6VlJVaDFJWkJGTjhtTkEya21LL09Qb1FEUVg1?= =?utf-8?B?QUJLN1M4aytkWnQzWFZYQUc4cDFWc2dZYVlOUHhjSGYrVGhYeDljSnVtVCsr?= =?utf-8?B?REhENHFORGVDZXVkcmRGYUUxek1Kd09vNFgwcVpsM1pCQWRFZVNsNGo0NjJk?= =?utf-8?B?MVNTazNReFZZMnNUN2pzREhIUmVkeVRIajNIKy8vNzR1Tjc0QUUwR3Nrb0VV?= =?utf-8?B?YXRnYVBKWHNLa0taRzVmY3pVcWQ4UzZuWWxwcThwd1lodEJTU2ZOOUJ5RVFI?= =?utf-8?B?L0tWWFdFRXYxRFVjNFJxd3ZmN3U5T3dHYjZZUEFuSmY4NkZ5MUo5aFh5YUIy?= =?utf-8?B?M0phOW5QeDF4OW9SNldTRW9CVEUwZHIxRWNjeHdGZ1U0alAzS2xYL0RyVHhB?= =?utf-8?B?MWh6cVdmZFJNL2dtby9SV1dxVjNFTm1lVjlIRnh5ZjV4Z0hIZld2ZHYvT1pJ?= =?utf-8?B?Nm8xMHF3RWd6OEFPZjZWVUFWbFgybzlkeUxwWXlzcEQvM0pwdC85KzdFWG5z?= =?utf-8?B?a1FNTzF2RDcrQlFralh0WUJuNTd1cyt5UGZuejdSV1RUTW8xeHpoM2NnMlpi?= =?utf-8?B?SGxkNFFpaXN1OU80SFRXazNjNnF6SW50MVpQanNEbDBUTURBWnRkSXhwQWJl?= =?utf-8?B?eTBrMXp2TS9OU1F3bW9rNFllUXMvSFVHaVJ3Yy9JUVAyVmN2YVVTbTQybCtC?= =?utf-8?B?c3ArOFA4WlllZ0dBbEdqT2FPTlI4dU5sT1lBcWtuRkdBVjRxdTdVeUZYYXJj?= =?utf-8?B?OTZsS1pyZndKbGwvVjZFRElvcEhRb3lVYzA5OEsrWVVzTGNNVzBkeUlTQllC?= =?utf-8?B?Tm5CQjA4ZzQ1Rkc5QlJvWGdQeThlZEFRZWxXYVU1VnNKNzNEKzhkMUludWxz?= =?utf-8?B?NFlEeEV0V09adUtkVk9vU2NYVEpIblVGd2FucWdNNlZFdlplcGU2VzVIbWhE?= =?utf-8?B?MUdITlNlU3cyVktENktNa3pjclY5Z1RtZTJLMmFVb29BOXdSRFpjMHhyem4w?= =?utf-8?B?RzRNbUJFTXZqbnNQbk5laDJBVCtOV05CNGZLdjFvSkhoSWdINTYyUSs4N1Fu?= =?utf-8?B?QjJZTTJkYkpVV2lIaldPMHVESGVZN053b0JxVmJUcTMyVHk2OE83TElnNzE3?= =?utf-8?B?Mlh4RktoblhUWFRDei9naDFrN2lxZ3NWY2hxQmdFVndETzExQzg5WjBZV3Zh?= =?utf-8?B?czIrTGx6YmtJV09SZ0pjUG4xRlBmUlJMQ3prNE41dUxnYjZDd2pqZWNIOGFu?= =?utf-8?B?Q0FtL0ZMNzVBMHpFYy9jUXpFTjJnOTNJcU0wdzhXb3RFZkcvNW5pL3hzaE9M?= =?utf-8?B?SlZEVitBR0FpZ25mV2hiWVBnZWZHMVhBamdPR0xSZ3pWcHZJUkIxQytpTjdw?= =?utf-8?Q?So4mFqW08g8b3AEffvfXFdXRubLwLDWhIwERwyFu5MbFu?= X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;6:fXr0yDzFWTInMZoF0m7KNZzJnlN3Xp7P6DNtXXKqevHZ8gGoAnr8G3E2Pth7FzPQn8JPDsR05VV395ItjaAJwkpWVRVL2egqlN6+aReNzS2JxgoZupaMulEl7HnUYkTE4Syc6VWzZVbCup0UV2lJKHRsTPgd4OeL13x+yfuErNRuhjnurURq8DSgUAvjgqAvmGPb/1hHZrQZ4n6e8Lyx2XL9I5AMersLouabJbYVNs5vWbsNdietDBOr6Zz1ucZV2Vl8EYpYOW+xAI/Tv2L7y39KwnmDgBj//y+iAJHMwtdpqZfUdpLUyY8kw04F6/A6sLXOFObVEzYn8PbA3E1kd1rbFeXs4jWpHPn17R+Pw4xqw5jCtM3Ka0Gq/u4VwadaSLOExN30xALd4CKRwSyi8CNef0KqCDqJXbBgG5RgsptnKKntCpbBYL/M09u9dhGpzbSnjViOSn/RL7iT93TE5F0EO3Im1WVytkd3McHqaVFpZ9/LAjq60JJcsKC9v7dUP5zdGKxqAHjPUdjUq7X2gg==;5:23kbSPZptZeqRDwjvjnR7uVuYf+WNhPOAfxoz2VRckRDCQ7bXm762lfm6I+v5fPXLH8YRjaMQYQUE1MQlQB/QzsOtEmnyW5HGDh6NWzJxHc4LP/tJq8Mx8c3ikiQD4Wip7WssruZohlVOuDzFqGr8Q==;24:7HZcu3nW5dWp0BD2vjJxVn+hKks5z+DnSHxPHvKzWldxV+HrR1t2eIAaRTfLwQPw+Y/STwV3CqIhMVHtM94bPTn/y8hj0+6oMovEZaFMphE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;7:Q3ip2r+mrN7TsE9hFr2WAbL8giPZaeVzR5G6GgLojWimksEuSqM8WnFWbGe26EF0cpSXzEXqoPswvzj2XkFAKAv2ZjwiRY6SqQ06aRFgfnZuxa3CaL+stCloRiDsqg7B9yu6T+hIQl4TAu03zL3EeY7KfpR+1TbPwJJEHIhwK+g7oVcT/rrCsG13bjSaYB0c+pwY2HFETnVJXeioSh3tetHD7E+Cs4k1slI1aqoRclojGKjvlQiUkrHQkxhAW5pVQl3CQGm3jomP5XY9UKS26SgsvrYice0ZD3fg6d+LX2VDy79KIGKwR00q6LcxjFH91vvdquLCOc1W1pHNLCkNOA== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 09:10:44.6814 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR02MB228 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00160.txt.bz2 For some reason gnulib calls the headers fts_.h. We need to wrap it into an actual fts.h to make it available. Signed-off-by: Ulf Hermann --- ChangeLog | 4 ++++ configure.ac | 18 +++++++++++------- libgnu/ChangeLog | 5 +++++ libgnu/Makefile.am | 9 ++++++++- libgnu/fts.in.h | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 libgnu/fts.in.h diff --git a/ChangeLog b/ChangeLog index 30b3884..da4d288 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2017-05-04 Ulf Hermann + * configure.ac: Check for fts.h before testing for BAD_FTS. + +2017-05-04 Ulf Hermann + * configure.ac: Check for stdio_ext.h. 2017-05-04 Ulf Hermann diff --git a/configure.ac b/configure.ac index 2488bbc..f04a6c8 100644 --- a/configure.ac +++ b/configure.ac @@ -302,13 +302,17 @@ dnl tests, because the choice of the file model can (in principle) affect dnl whether functions and headers are available, whether they work, etc. AC_SYS_LARGEFILE -dnl Older glibc had a broken fts that didn't work with Large File Systems. -dnl We want the version that can handler LFS, but include workaround if we -dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to -dnl check it before including config.h (which might define _FILE_OFFSET_BITS). -AC_CACHE_CHECK([whether fts.h is bad when included (with LFS)], ac_cv_bad_fts, - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include ]])], - ac_cv_bad_fts=no, ac_cv_bad_fts=yes)]) +AC_CHECK_HEADER(fts.h) +AM_CONDITIONAL(HAVE_FTS_H, [test "x$ac_cv_header_fts_h" = "xyes"]) +if test "x$ac_cv_header_fts_h" = "xyes"; then + dnl Older glibc had a broken fts that didn't work with Large File Systems. + dnl We want the version that can handler LFS, but include workaround if we + dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to + dnl check it before including config.h (which might define _FILE_OFFSET_BITS). + AC_CACHE_CHECK([whether fts.h is bad when included (with LFS)], ac_cv_bad_fts, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include ]])], + ac_cv_bad_fts=no, ac_cv_bad_fts=yes)]) +fi AS_IF([test "x$ac_cv_bad_fts" = "xyes"], [CFLAGS="$CFLAGS -DBAD_FTS=1"]) # See if we can add -D_FORTIFY_SOURCE=2. Don't do it if it is already diff --git a/libgnu/ChangeLog b/libgnu/ChangeLog index 2cbc87f..d6ada7c 100644 --- a/libgnu/ChangeLog +++ b/libgnu/ChangeLog @@ -1,5 +1,10 @@ 2017-05-04 Ulf Hermann + * Makefile.am: If fts.h is unavailable, use our own. + * fts.in.h: New file. + +2017-05-04 Ulf Hermann + * Makefile.am: If stdio_ext.h is unavailable, use our own. * stdio_ext.in.h: New file. diff --git a/libgnu/Makefile.am b/libgnu/Makefile.am index ca1a078..21f9c5f 100644 --- a/libgnu/Makefile.am +++ b/libgnu/Makefile.am @@ -36,7 +36,7 @@ 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 \ - features.in.h stdio_ext.in.h + features.in.h stdio_ext.in.h fts.in.h CLEANFILES = SUFFIXES = @@ -68,6 +68,13 @@ BUILT_SOURCES += features.h MOSTLYCLEANFILES += features.h endif +if !HAVE_FTS_H +fts.h: fts.in.h + $(AM_V_GEN)rm -f $@ && cat $< > $@ +BUILT_SOURCES += fts.h +MOSTLYCLEANFILES += fts.h +endif + if !HAVE_SYS_MMAN_H if USE_WIN32_MMAN sys/mman.h: sys_mman.win32.h diff --git a/libgnu/fts.in.h b/libgnu/fts.in.h new file mode 100644 index 0000000..2fc57d1 --- /dev/null +++ b/libgnu/fts.in.h @@ -0,0 +1,34 @@ +/* Wrap fts_.h under real name + 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 _FTS_REAL_H +#define _FTS_REAL_H 1 + +#include "fts_.h" + +#endif /* fts.h */ -- 2.1.4