From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81999 invoked by alias); 3 May 2017 16:18:28 -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 81816 invoked by uid 89); 3 May 2017 16:18:26 -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.5 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.5 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-he1eur01on0123.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.123) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 May 2017 16:18:21 +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=H+jAUegl3ArbsglwExrs8n3yPYhZ7w2y20CCv8GBSS4=; b=O47oYWUPo4gsjGsGOMGpJh2okE2oMWjKr7nx34if2YRS0qDxPPIGu6Ej3muzC4nNv1Mqb59sMLCWyxgXZOfVJSJluC2h9cCIY+z0NEH30+0UzYDiNQJHYUQS7GSGSXpzpxmmkulk/r3cxNCHBT1pd3EIWdj5LeL5NRKa2noqJQE= 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 AMSPR02MB232.eurprd02.prod.outlook.com (2a01:111:e400:8022::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Wed, 3 May 2017 16:18:20 +0000 From: Ulf Hermann Subject: [PATCH] Add a "selfcontained" mode to provide missing headers on windows To: Message-ID: <842b322b-7a53-d8fd-d6a6-6b5c350a5b3f@qt.io> Date: Wed, 03 May 2017 20:35: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: VI1P194CA0017.EURP194.PROD.OUTLOOK.COM (2603:10a6:800:be::27) To AMSPR02MB232.eurprd02.prod.outlook.com (2a01:111:e400:8022::23) X-MS-Office365-Filtering-Correlation-Id: 8146f78d-6d54-46f1-25f8-08d4924003de X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:AMSPR02MB232; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB232;3:rQGUjHFTkHbOjduEKDPKaME9ca+N+EAXcscVGEUs3Of0eAhhD3Wp3wk66T8pkCbSE3nsJpe1zzWwIWv4SwXt1N+bYe6Ufb8EaQe9zLG/Ijm+E3+1Pfd6ENrSasdDY2wVIKvpvT1nxA4cVrkg+XzaGKFOjLJy3vg0GOSau0mgzqDI4QJ+u5Bry2u9kVi1I8pgDjAOAE+PHfmUUetvhTDzcwhFuWShKt4D6BzbI2yVZS2imj+fLASmQdLEk9+C0EwWY62Q6MCdsiFMFmN8epQtIylefFaQH3gvIFCnnT7+1Aa0vCEM8e2O5tlrRUveY8bEpUOfrAv7wcnRxq2hWogxAA==;25:+85LOZSHShlB5EJrploRse34zmITeSQ9TIBaupYsIPE7K69dJlK5rjUVRJWS2p6lgt2BcmWX1En01rVUwSSUp9TpKzYZYgqtzYKJGQvkLacNbb4xnt5NQBEtQGSKqAjcP1gXha7r1OuIgunFv6j+kv3Ygd/GMgEBYL9f1vFuBNEpsqgh/zDe/gOAzTYV63tc0rTruJ0VVdAdqCuz1Ms7kqqbV5Iw9WjPbNQ0M3xgSX3CaGQ5EiABbsAXCoPjGg7AR3hT/slGNuxTt/bcqdnJ7wNnFfcpEok3tN88GLJ9d9KMDiKmV6rEaNpRbo+21oykOUriqCgqTv8ANT19NwUAyhXbSe0QYPWoGfanwNo7q5O78wz5EC02k3W4Sv+zaL1EfXXYHCCdFN4CjUnmmGd/f7B/L1t2ql5vne+MNpRRAGbiciXsJwviMWUdwJlFQ5gbOllHqzUSX3VFFd7YbPrNDA== X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB232;31:LV+TKLm4E+KbjI3d9tUnnEHdHt3eGaxzQJKwtR8Y4cwoIeN/IdbZ8psBC3iz84L+GZUfvbxDbsMSDITLm6WcuUmNHYhM+5RueXLo4SmnfZU8Ewl5fGQ8HrMwtK7kTQx0VndiRY/XQiKnu1pCmJ4pqbAFdKZtTGvQY5H5XhIsIs7PvKa3u1IPSnTaWj8r1Z+UWdXWmJ0WPsROazyq5KW3CnLUrbu3MGut6cgAlGa5YJjcXCOCpBsqrzynHsExhP+ZOesdAVagmiCdagWqRiq9EO5ICJmSVk+xL57RF3quZ+M=;20:CQGvC/oG+Xi5UEqJOrp8hZxfpi4U85jzd9dEvja6klMBoGSdA3S2qFeIrM4RarRaabPH4MWcnpZDyRzfpYo5pSOp+OVRSffXd9SSURl7OZPev0bVoo6I+ONxlTx1NyXDvG7BEFzq0pz9O0XGhYTSNz6rMdVmCLpVd52SvvNhjYctdmXx8uMBR6PnO1Bx1nc/g8hIitcMsFW1zorCiELaJt9cd7FjIsCoXqJgNzOISfbUOoag9XwrzH60uYfomR+L 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148);SRVR:AMSPR02MB232;BCL:0;PCL:0;RULEID:;SRVR:AMSPR02MB232; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB232;4:XKHEkMmRc5zjB2Tz8Hchk+WiAZpp06Mt/eRPyFsNdiMUMIfVu/6VXz68fifN+AHWhJgfwy6e2lcuUrnBtf0UH16y0gzL2d797Z3Xgh0B63sB960cCzwxPclGsuYx8j2VD003H6Y7/pDea6vyyz5sEp8ezCiUApky20YQdyHU6GzncpUupAOaBOygFMwLc3TfxE6S9tkeQY4SHqE81M8xfgCJRf+fpwP/uZNO1mcOA5PuQWfnPK/RFhulRCA+mT/j17OUUQvmOZYSvzyrKOXo8tFBriAgfSohwoDEcLBW/acoVgF1RErrJAWlcNK1w49zcO2ZXmhGvJLrmdXLBJrDs7OYMVuoBEMLc9hTTHDrsdp1pqI/0AXMZJ9we2SXseV1gKOhGO98PthhInFyjuQipoYtILUdXKTNNFFpBGkOum4hXJMzXJOTZ/Kjbfj901Eu7+NIMOXh8i/t4/qWnhw/lDA/ikVCB5emnnhN8vK6Iz6OFOeVXIfwRx+oZMBNrYGk2A18dXDLGFzd9jVuY9DiYxOzVniNMDDXUBLhOVyqQYBAMJzUgTLH7ctxeI1XrY7CxhHB4lq0RPqgBYrvx0YS7dCSGHkNUeTwTL5VKK9a1sSipmMvKwdgswArF9KEyYz9JXDcPJ6PIjVKtEIZtwWdPvLmD9aDEdGla4MHW6C/FC7jMZAYibut0YP0oywGCvy77CjyWGhXVDip8HqOzNje/1CPzlWvh7Xze2FiE2mU9rBGFMzvlQ7pKW+H0Qv64EBsNQ2cEJlC1DrN5jrtiPpz5Xvvc4Ea4kOy4UJqdz/1Q4ZVHxN66nbbr0R4pok1rJ6WwsiD0iIXc2H9KLdbXr5dqkciQkHZi7h9eWnYrChEcZZ9PZdfCBCVvTR7FtTAeWtb X-Forefront-PRVS: 029651C7A1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(39400400002)(39450400003)(39840400002)(39410400002)(377424004)(54534003)(2351001)(5660300001)(189998001)(6486002)(77096006)(6306002)(23676002)(31686004)(64126003)(81166006)(3846002)(4001350100001)(53936002)(8676002)(6116002)(83506001)(6916009)(50466002)(478600001)(38730400002)(110136004)(6666003)(42186005)(33646002)(2906002)(86362001)(31696002)(50986999)(25786009)(54356999)(7736002)(36756003)(74482002)(47776003)(230700001)(305945005);DIR:OUT;SFP:1102;SCL:1;SRVR:AMSPR02MB232;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTVNQUjAyTUIyMzI7MjM6aThRT05UL0hLNVAwZ2h3dzN3ZHRrM0tUVDNS?= =?utf-8?B?ajZlVWdCR2h4QlU2WXNpWGxEVlZEQVVPWmtJUHcwMURSTDFvMmhhZUg0Q3hF?= =?utf-8?B?ZUYrRWVIR0Q0MGhkMlorZldWWnpvVlJlZEZ0THJRMWpPYllyNTJJRVBaSnY4?= =?utf-8?B?RWMzQ2VNNjlOd2xiY3I1MDUvcURRU0RpT2FGbEpzOE9MK1Y0WG5WMUEzNk9a?= =?utf-8?B?OTFtb3NVR2djZFZSNEhvem83YVdwbVJKbkRGRE8wMm1BMVFiMW5CSGZNOEZS?= =?utf-8?B?cDN2ZVI5UDNqTkZtMU41anNyemxUakZnNVRqaTd4bm9xK1dqZUg0azd4R1lC?= =?utf-8?B?VkVDL0NOSlplSzBHR0JCYmdLZEVKQ1BZeTcxeDBtSjRCWlIrV0pkK0hobEhX?= =?utf-8?B?dnh2aTFvbUltUnUvOWdCZmwzdnhPNUczWVl1SlVHVVdNVzYyNG9Od0NKTkxB?= =?utf-8?B?MHdEUHBkV0NWZ1FJMmQ2WGlKMENwdnZFRlp6K2JYdk5hTkNFVHIyMjg3SFdh?= =?utf-8?B?dTMwaSt3MHNCc090anJXMHlWdzNEd2RUbytuOTZsamc5VjRpU2swTEsrNUdl?= =?utf-8?B?ajdoVWFKUVk2MjR1ZURvR1hXOHJXTFRtWWdlK3A4M0hSVlRxSEFKQURCVmxX?= =?utf-8?B?QStuMHRBT0FiUGFXdDFIcmx6L0RwczY3S3pNU00yVW1zUnJMbThJcDEzSS9I?= =?utf-8?B?STFBUFRUWlhiaTlFVEtIakJEYm90WjNKVyt4K3lVQjFaQ0gxMnhFdnJNeGMw?= =?utf-8?B?Y29KQmZ5RTY3UkprZ2lZTmpoY05DSGNJQy9LOGRNTVdReUFVY1dBZ256Z21E?= =?utf-8?B?RlBhY2tPOHdqb3p1M0Ixd3JKRDRBQ2xaSlBxVjllTmk5OENGNERoMlFGOHhF?= =?utf-8?B?YTFQS2V2K3UyL3RIOHZQV1ZuZ2NrdzU3NDNtUlFDREJQZG0xYktoN2xjU2hJ?= =?utf-8?B?bTA3aGl0L0NwZ3F2ZkMyMXlzeUhuOFRKWnNiNWxmYjJRRnArQ054RGl2UXA2?= =?utf-8?B?WHVrd2k4b1RCMGtRQk05WFRmZzF4a2RZL3ErUldwK0VsYlFDOGE1WSt3Yy9j?= =?utf-8?B?OGN0aGNMU3hwSDFUeWh4ajBuNjhuTWpXT3RRR0hKY3pmSlk4K3dxZlZWeFBI?= =?utf-8?B?QlN1aTBmVGtsczVnU0VBaTlFNG03a3JIQlpMb2IzNmhtUkNRSUx4bm9yQVNF?= =?utf-8?B?VUg0VWQ2ZjVhTFg5aDFmOXlYTGQra1prL01OWWtGbHNKVGZWUlNzZDh6THJj?= =?utf-8?B?a2NWeGV2Sk1HNEt0NmlVbmk5aDdwdVh6cHlZQXlLY0JESWNISDBwTXQvTWQ2?= =?utf-8?B?VWVSRCtrUFZ3R0lFcE55eUxrcGFidmZhN05YLzRzOVZDcmZ0UFcrRnN1Sml1?= =?utf-8?B?bUk3T0N4a3RrckZvNnhrVkNMbWZvcDZ5SVU1L2J4eCtoa0pQZm00TkltQkVa?= =?utf-8?B?Rm84dkxRNmdrb3FXQVhmajNKdlRBT1J5WmNLQmVaVWtrODlma0xyZlRSajVU?= =?utf-8?Q?ow0gTCtFFSW/1UkzNi6T1Ftk=3D?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB232;6:F+/sT1V9yR8yYq205HhmVt35dc2Cl07W9wzqpvLHm1vEkO6K+/FUvvH3JMDFprcAwusPdIfNXkMzRGM6qnWp/cayz2UYVdRjjD/DOknDpK9wER1uJS7u8QHztYhT/rInpLX9C8T8vEFuU/lazKIQLP4+MYUWKenWAdkybdgI1tBUkzxPeuVILqNWgEfiiIhJj2vOYz7y1LKKRm78uarPoubLcVUOU1U+JfLFm6mK6aCfttklZsJ2O9DtosXWX5rj0YathyQqdcsCGuPBPClTYHxX3FAf+iuaQYgrUt3uM1gxJlEVYRbv9QqOIGzlhmTFFL8r2yPLQa+S0RpDLbB2qXtv3KL1JD4bnWLcvf8IHHniNl28OAyYcHYlONNQpqZJKVC6MJsSJrEtcAW1kbxV2vCZMhG1o8bMpokZ8nnSXCEZ00FiL/Pdz29LjGPaWS7O4pSEtVxFFDUMOl1SqeEYx2IYC9pEgpg7BZltxmA9z5nye/c5Sb3xrqnot6qWWW1+XsR3ZNADKBNdQwLtZgBvhg==;5:gGaRu4myHcB+2A2CLtpCaGR8mllydeCwyxGUQ/64idepqRE2+eH5P5Xq0e4E2iPAbSVM1SRxtDOFNfwhPNLul6PNu6zDnB7LzLiQtSNpGw7UdFNv7CPXp2DZG3/7i7PAqWg9XGKJ1ltLxAUGvYNqFbJ6MvA/7Y8FfzKGmwgXrmk=;24:qa56KZ8ygnH8Y0BjCq800KTB0yISbvjz5YWO6gxoocsvSD4gojbKTJkba9p44Os9lCBk8IsK3qntH7jEcGnXWF4mFcJ3B6KbEUSOdyRwvdg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB232;7:zuCRn81EJ6wlQ5/l7R89ZDyn18FIHwo2LhEhhwQx6vcOxKDxEgq3QHquXKUejKgAOvk2duZaI1A345eXYi/UBfbEFunA3SUI2rbda7z0VadGzRslzE7TWnKLZWWqfN7ocMUfMdGs/6AGmBsi1x2dNI+JKOYKKv5APvmjkMk1AlcGOoTAYxGwQyK8OBKcvq6hOBuu21GJFoS3B0JiNITEVHOi6i0E5qhuAvG05ObpqEhYH+QR++IPuow5NI7KfoPstZfVtp6e81Qflz+dFDEayt51PmXGEd2epFiv8YWZlSPVR4UZQIRAXwIpqv8D0wuSfPYSkseDGpa8RGbbZstaRA== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2017 16:18:20.5128 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR02MB232 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00148.txt.bz2 With MSVC there is no features.h, uid_t, gid_t, mode_t, and pid_t are not defined and there is also no elf.h. To make it possible to build other software against libelf and libdw, install our own version of elf.h, and a bare-bones features.h that provides exactly the above declarations. The features.h declarations are provided like mingw defines them. Signed-off-by: Ulf Hermann --- ChangeLog | 4 ++++ configure.ac | 6 ++++++ lib/ChangeLog | 6 ++++++ lib/Makefile.am | 11 ++++++++++- lib/features.h.in | 43 +++++++++++++++++++++++++++++++++++++++++++ libelf/ChangeLog | 4 ++++ libelf/Makefile.am | 9 ++++++++- tests/ChangeLog | 5 +++++ tests/Makefile.am | 6 ++++++ 9 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 lib/features.h.in diff --git a/ChangeLog b/ChangeLog index d43eeb6..cf14aec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-05-03 Ulf Hermann + + * configure.ac: Add an --enable-selfcontained switch. + 2017-04-28 Ulf Hermann * configure.ac: Determine the binary format we're building natively. diff --git a/configure.ac b/configure.ac index e4b2946..1e7778d 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,12 @@ AS_HELP_STRING([--enable-gnulib], use_gnulib=$enableval, use_gnulib=no) AM_CONDITIONAL(USE_GNULIB, test "$use_gnulib" = yes) +AC_ARG_ENABLE([selfcontained], +AS_HELP_STRING([--enable-selfcontained], + [install extra headers to enable including and linking the libraries on non-GNU systems]), + selfcontained=$enableval, selfcontained=no) +AM_CONDITIONAL(SELFCONTAINED, test "$selfcontained" = yes) + AC_PROG_CC gl_EARLY diff --git a/lib/ChangeLog b/lib/ChangeLog index ecc6179..2da6235 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2017-05-03 Ulf Hermann + + * features.h.in: New file. + * Makefile.am: In selfcontained mode, install features.h.in as + features.h. + 2017-04-27 Ulf Hermann * eu-config.h: Define attribute_hidden to be empty if the compiler diff --git a/lib/Makefile.am b/lib/Makefile.am index 17d16d0..87a922a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -39,8 +39,17 @@ libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \ noinst_HEADERS = fixedsizehash.h libeu.h system.h dynamicsizehash.h list.h \ md5.h sha1.h eu-config.h color.h printversion.h -EXTRA_DIST = dynamicsizehash.c +EXTRA_DIST = dynamicsizehash.c features.h.in if !GPROF xmalloc_CFLAGS = -ffunction-sections endif + +if SELFCONTAINED +install: install-am features.h.in + $(mkinstalldirs) $(DESTDIR)$(includedir) + $(INSTALL_HEADER) $(top_srcdir)/lib/features.h.in $(DESTDIR)$(includedir)/features.h + +uninstall: uninstall-am + rm -f $(DESTDIR)$(includedir)/features.h +endif diff --git a/lib/features.h.in b/lib/features.h.in new file mode 100644 index 0000000..6eb3c67 --- /dev/null +++ b/lib/features.h.in @@ -0,0 +1,43 @@ +/* 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 + +#include + +typedef uint32_t uid_t; +typedef uint32_t gid_t; +typedef uint32_t mode_t; +#ifdef _WIN64 +typedef int64_t pid_t; +#else +typedef int32_t pid_t; +#endif + +#endif /* features.h */ diff --git a/libelf/ChangeLog b/libelf/ChangeLog index e947e19..36da20c 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2017-05-03 Ulf Hermann + + * Makefile.am: In selfcontained mode, install elf.h. + 2017-02-28 Ulf Hermann * Makefile.am: Use the predefined common library names rather than diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 3286dda..1a2b85a 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -141,9 +141,16 @@ uninstall: uninstall-am uninstall-lib rm -f $(DESTDIR)$(libdir)/$(libelf_SONAME) rm -f $(DESTDIR)$(libdir)/$(libelf_BARE) -noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ +noinst_HEADERS = abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h \ chdr_xlate.h + +if SELFCONTAINED +include_HEADERS += elf.h +else +noinst_HEADERS += elf.h +endif + EXTRA_DIST = libelf.map CLEANFILES += $(am_libelf_pic_a_OBJECTS) $(libelf_SONAME) $(libelf_BARE) diff --git a/tests/ChangeLog b/tests/ChangeLog index ab1a3788..b5a1866 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2017-05-03 Ulf Hermann + + * Makefile.am: In selfcontained mode, run the system libelf test + against our bundled elf.h. + 2017-04-28 Ulf Hermann * run-disasm-x86-64.sh: Disable if the native binary format is not diff --git a/tests/Makefile.am b/tests/Makefile.am index 114ab7a..ed050eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -511,9 +511,15 @@ emptyfile_LDADD = $(libelf) $(libgnu) vendorelf_LDADD = $(libelf) $(libgnu) fillfile_LDADD = $(libelf) $(libgnu) +if SELFCONTAINED +# In self contained mode we cannot expect a system elf header. +# Use our own then +system_elf_libelf_test_CPPFLAGS = -I$(top_srcdir)/libelf +else # We want to test the libelf header against the system elf.h header. # Don't include any -I CPPFLAGS. system_elf_libelf_test_CPPFLAGS = +endif if USE_GNULIB system_elf_libelf_test_CPPFLAGS += -I$(top_srcdir)/libgnu -I$(top_builddir)/libgnu endif -- 2.1.4