From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20711 invoked by alias); 4 May 2017 14:22:52 -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 20685 invoked by uid 89); 4 May 2017 14:22:50 -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.8 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.8 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-DB5-obe.outbound.protection.outlook.com Received: from mail-db5eur01on0126.outbound.protection.outlook.com (HELO EUR01-DB5-obe.outbound.protection.outlook.com) (104.47.2.126) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 14:22:49 +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=wEWMXm17vc7gOftVGvc9s/BpQc0RMRp92H7fhtB0kso=; b=M4goXfWwbceqVmKr5PhPhnRgRMs6J0c1b9q9h6WbTI0TxtsGBGs5CP5PsFB3wmZlJwjoGCX18sFY8jYc+fQzwTr+CZdbhK2h7LX2AmxgbExiWUaLRcD/EcxLJCsgp6SJU6j3GKCkMnyX9+ULzAgyYR4SVJ3jnR03/uO8YOzGcuM= 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 DB3PR02MB235.eurprd02.prod.outlook.com (2a01:111:e400:9410::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Thu, 4 May 2017 14:22:48 +0000 From: Ulf Hermann Subject: [PATCH] Provide a windows-specific ORIGINDIR for eblopenbackend To: Message-ID: <90bdc3c6-4f2c-b0d3-bc77-b034538b32f3@qt.io> Date: Thu, 04 May 2017 15:08: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: VI1PR0602CA0024.eurprd06.prod.outlook.com (2603:10a6:800:bc::34) To DB3PR02MB235.eurprd02.prod.outlook.com (2a01:111:e400:9410::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 307d8411-a3fd-4c65-2d22-08d492f90a76 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:DB3PR02MB235; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;3:erh2fZzpteLCdwXYk3A2OmPlIV9+BFUNEtMt6K2BRT38NuuhTG86WAtRwLfSbtl64WY61VnrVpyc5r/lSa63N26v3TQ24Ifst2iCfrt8+91TKAwnNwHnrLaI9Uo5jLtKwipXjS49E4tO5piXKYaCnzgG26QtGXAhfKfXld2xVtA8uUw/oHbhLIkmPulwHOhpNYiSDIi3RFy1m9FOk9ldqKowsUBNvdn9r27AWDVsLe64VjlOzOMNl0un4lb3H3eUHeD9ZzQxxqonxwDcOaauK158nps+fGs1pssO4pIv/WqoVySk7ULrnpaSsxu68nQ1;25:Rs8qNVgLz1heoWodII7vPN+zKLCT2ov75AriP3Ha0n9Zr5aDy+ozAhV3/W6O7CTT84pBvtGt8BAc7mK4GSnreIPaO5+zbWVfavzAbCDNa1DlB7R85/kNoiy28FsiXJd43Sc3KGDPVsOPsgkPDaJ9H0YI5hMYZPHRRrLN5ZTTgu/UGBmanjbRHlLNglMZatxWCrxg7WpaJBjksYZ5/nUEvm7s8OurlbEWzJrmQ2TMzamaaeFYjuDG7HYDB6Q16eDwHqWbEdlYT2kc0wV6D1mjDY/rGdpMJelPqD3GHqCcuU7RoTE9gdEcdzBAXOkHSya4oMN48OkX8ajDulYlgA+LOcLUPRbbBVOAZSdFyzTMDRzhFyPw+2OxgCCcgjpugfwJZu+WxQgTv/SidWdaAHYDmZSjE6eF5WplrYmTxamDewmSsR61R6ipu14c0FPOCA4GP0tUQlUfz9+MooDoikQ8wSHug+jLMT9rr06400vw8BA= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;31:t+PoC8B78OubLXzZH2OY3wyaF2Z5rZ2AaUlRTU/iv9qxzvGthdfgOPU3PXTUTvu5iTKgybPwuYJ41/H/Y5vWQ8V4WfstdmfJIIrCquad6+tWzbvWYILIbXnW1EfXqqxNEfuvL32Y49strW62GfDwa9t+ZUDqnJun78oHIzt9wBXiSs3T6BAX4aWRMFgHYo26JmUPWr/nr1CAaeRgJCLelIJ1ZgQLLvG6mNUvJchAEdYKYOvSpCyLfc9rJYwhOazu;20:JKOMfQV6szsA/eyUHgGhPBjGo15Vt3JCsthBUn7HG597912OQyXoDATM0LxCH73VRBGE8s4TbRnp3IfMJCwaZrMJ2yGmvMWMH9zG643zh+ljl6Qp76t5jDABfv8kA+pmy42UJvtqRFpinEg8Q/TYUw+N0GtarT3m7A6rqFdZKIibKvbOoicCUFM9NA+HiizpgPrenDjqDPqJTGcVGcCp9gXqWvYZHYOYUprZtVrlplbcLb+JgRZM2Y+9jPd/afxC 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)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(2016111802025)(20161123555025)(20161123558100)(6043046)(6072148);SRVR:DB3PR02MB235;BCL:0;PCL:0;RULEID:;SRVR:DB3PR02MB235; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;4:ifI91ZO4asOfzALYqaZV+0f84WTXkZoqgCWP1MvEzwr8ZRZI8P0uhxRpckdgXm9grAlIqoD2pbe1DeNKdOxToAoEYcX1DBUMefzuO2z7XJhm4e2aV4cxDSOxc20VNL05/vSQmUwJLILrMOpyXilPpTj/boqJ6ShB8/n/6KksUaSqQcvkNbvBwZF7C5p9FObo3uUCQFPTKNIf7qDRcAESG4bqLVt4mbcK8tB4wyT/pZlVhj37ngT/CwU/+pfJARsvL74djq5HftyLpKEdy6fvI1e/YwbSQuPY92HxUGQwGj9laVXxjQcNUhl+y5HqFly2ZkaJhz1+7jQopTiwFsPquk75C9voh7s8HgdtCHKW+jTlksCbR/LnxyikMOPzM0DyXvwYlN/2uxi3g8O7A4PzbaEdtFL4sneMPmDeM2rgQd0/akWMcSdFov1XcHBloiXjwYUL83G6jMUaaX8PnuCTtqzyBIYnCcBoUBg+0ZEV31rCN7YwVTfzN8Cl8VrQmk7LHiP0uRK4XsGx2rYJdaaXvx/f3Y0bVjrg8t2tx6/w+AnKR+mJZvJUxtNXIw8HIwHiZfL4vYv7zQ1nF3a9wXGgyIuJgfIjyB3dOHZ5MsuUk30fvhuafW+RF//U7L7hfODSZCOyfP/tjMH7c/SU2uikAkVSPMGJOzvVx6vpVG+foWP5l0zZ9Zyb8Qluk+3L9vfWXyqC7zMsRvpDUiIyqTs2mWLYnB4KnWf7vrUaXsnRfUczSXK6CklHM38ZKrRQWmbxD146cZI5CPChsqJ43N+FUbKhkK/yF205dk92Tw24wn7iBhhGBgeWr9IZDph+rRmiRLJgsD04Raz5Gu3GE9Isrw== X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6049001)(39450400003)(39410400002)(39400400002)(39840400002)(377424004)(2906002)(53936002)(305945005)(65826007)(38730400002)(110136004)(230700001)(4001350100001)(50466002)(54356999)(7736002)(23676002)(50986999)(189998001)(478600001)(47776003)(83506001)(6116002)(3846002)(6916009)(5660300001)(6666003)(66066001)(31696002)(2351001)(33646002)(6486002)(64126003)(77096006)(86362001)(31686004)(36756003)(42186005)(8676002)(25786009)(74482002)(81166006);DIR:OUT;SFP:1102;SCL:1;SRVR:DB3PR02MB235;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjNQUjAyTUIyMzU7MjM6dThaQkM5blkvRTZBZm95SlNiU2hqT2x0WFVr?= =?utf-8?B?ekJGOGdPbmc2cm9iRi9DUUpHeDFObkhLWWIraG4rQ0loUzlLWmFrdTlYeDk4?= =?utf-8?B?L1ZPMHh2QitFaDZBUUNlNzZKcXI2MlA1OWg0ajdnVzc2TDF0aHdFclRObFhD?= =?utf-8?B?YVhhZ1JCc2FEblpaN2o3bzV3aVU0Qi94Si9GSktVamYySWVMYUdLTEJkQXM0?= =?utf-8?B?ejgrTGg4L3JPNm8vdlM1dnpSUzlMU2R1WFZtaHZ3S3dMd3poR013NllhQ2JI?= =?utf-8?B?Ykk0dkpsL0EwcGxpMS9pUld5bkJ2Z3drQTZ1bnUyQk05eTBaMys0V2pLQVhX?= =?utf-8?B?MVRhQWhpRlVGbFB4anhtRjArZ3dKUUVLd1g2QXNscUZ4K01BWStBckI5bFJY?= =?utf-8?B?U3ZNK2o1dTJBbnlhRGczZWcxQ0l2S0xEUXJDNDJueEtYYVNqVDBWUWprMWtl?= =?utf-8?B?ektrUDRERDEvd3VsRkFBVnV1TTVlS04rQXhkNWxEeDdOMnpqRWR1SWRFeVJF?= =?utf-8?B?NGRaRkNDM1U1Q3pQWThxNS96bVhCVVBNMUhWT2JPamU4d2sxdVVFTjgxMTFP?= =?utf-8?B?N29UZVV2dUZkbU8yaEptMjlZSTcyNDJWTXJodjBOOVd4QXVQQ0Jsend2Z2l4?= =?utf-8?B?ekNEY3VjSTlFSTV5TDFPY2plUnJtQzE2MUp2amxpNXRHOEtQaElVMG13eWRm?= =?utf-8?B?OVJJcFFCejZ0R0JLS1pIN1VWTnZGOXR4VHQyNDBOTklleVRvZWQxMFJIdHdB?= =?utf-8?B?UWx1ZnhkNEdkL1VkQjZOWW05YzZYMmkzK1RMWlNVNmJaTkZqYmdiR3NIWThq?= =?utf-8?B?dXE4WGFTa0gwL24rZmpJSHVLVGRUVGRtY0RQRlViclFrY29hOHJVV0ExVzRR?= =?utf-8?B?ZGJocm54QjdlNTZaNzFOdnd6OXZkZTZWWHJQdlV0a2J0dnVuakdIRHdCaXFk?= =?utf-8?B?TkZkZEhPMmM0dFRqSWJzTjN2K3FEUHBiVEF1NXVnSFk3MmVCaUF0MXZZbVZx?= =?utf-8?B?eFh4TFdaZVBrYkg1UWxXUDlnOG0wamNJZytoZnpTNEZkMlpnWnZGUnpJbnNM?= =?utf-8?B?c0RCbnllSEZxZ04yVUNyNGtjNGpiUWJLY1BERDNOdlVEY2p0RHNGTHZKTEox?= =?utf-8?B?NG9hRmJJekZTQ1ZsRnltZFNwbXIwMzBnbVIzM3QzclA3bjZFSllBMDNsMFND?= =?utf-8?B?SUFoQVJLWmF5dHNxOGR5YkZyb2VLVXBUdllFSUFtcGZTdnpQQUNuMzBQZ1lv?= =?utf-8?B?SGh6SXpnNFF4S1JrN2pVZ1kxbG1FcTNhN0liVFhacFZtZnA0YXlON1pGR3FQ?= =?utf-8?B?aVBGS0JCVktvbVM5enhHQzhEdjhhbDd5dnZEa1hhKzBPdDZWcjN2enpYRSs1?= =?utf-8?B?TGpwNGVXUUhjOEhwWUxXckpsK0hDeVJCVVVZdkZaVDVua25UTUNTc2xtcnNy?= =?utf-8?B?VXlrczN6QXN2am1yRHRpNkdnTDRQemNxZkxCaGtjL2dvM1V1RUNFZFRCOS9G?= =?utf-8?Q?R82Eq+SUzl/epsGzsruUmRcEOGpwWlUkiKpEmgnJwo/DB?= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;6:zZ2ZJV7dXQUYTaReDqMFUXYnkg8R+MpSomhEeGlN/jYLTG4RrSpDYIbz4002mS9I1/3lFdZ+p2taQwgYwMTjXGCwELQs90GR1AhAcaTqfy4OTnWI56Baqt4rwHzHrbV/b2QrbVLczkrzM8sy3S78GmwFvq59VISy2s4U4nl0HFnLR+7HLeM6alGAs39WKdO25Pw/gcE7t5YzpKbPkdATSSAEofChMG19klyLm7xD5466KwQIiEf+UFOieBtTEdVvRi1Wm5MoandCvOlf69Av7gkkKBG4Gr29qzO8h0/lp4kbknVkpS2hn/ikMAzDVsgVQ/sLDBIZNT4vWVeSFzT1mbm1+yOB4/8Cy8uE7Q/qfHLK6rRpSNw1kbenI3BLTfb9j6Po0ToyvJQ8Zt3x5/GOV8Zhk0rVyItpSPFC/73ePTmra794zd3QD/xTPnUKpf6OkVGBop+Xmgz5BCwiwB/sM1RigR6wdab9zXrnEVKy8Ay10PL/BRBd45D8NAShIESLp9XpCFzI6CGHWrcdYFQMzw==;5:Sem6CyinPs7WXhMqrZctGrAX9ndIPbnSFxyxIduWbl50M0DneHqZeED6Ozy0sJh+oHv+Z6gnQLabaysNmwznhFd4WIjNCseRvaDI1b3SFLsnkoHoA7hWj72t9VxLNY9JISYEAcLn8QB5rovH52IakQ==;24:4qlclWxapYTS6yBmngUSbaKXPP2Ln7RI0/nYynmaIN7W2hf4LjxsPfRoy/aJYq98HqgIe+M78syuueNAI5vyzrDyH/mWdnNgpYTUm7uILeQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;7:pAIplHDGPfsKqAPysgkEtvKhCCHwT2gutu1Zm9SYMUZE5SoV2rgM7pg60vmQbJ/oXZI/CrbJrIQyra+hPsbY0YvFgP0T63J0FpZ7jCvTuvhxAfyQJp3TGfuqfPUBtz8Gl1TwjEbMe7KDIjdum45YoiMhgwiLbr9uk3FlshZXhpQgv9VYVE/1SCtQR5Ye2E2qJAKy8pvRtsB89fBkxxf7z+VQFx6j7J7vqJgNpmKtZC7Ur5vFOpwgLdvQsHcN0NsJpvGR8CKs1/JlETPNrcQ9+vQE8uuSWep2dqT+V6NRsGlvmmh29tTVdYac37HBORkkUab68d0Z2VqwS45jQFih+A== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 14:22:48.4190 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR02MB235 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00175.txt.bz2 $ORIGIN and $LIB are not supported by all implementations of dlopen() and on windows we need backslashes as directory separators. Signed-off-by: Ulf Hermann --- libebl/ChangeLog | 5 +++++ libebl/eblopenbackend.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libebl/ChangeLog b/libebl/ChangeLog index f9f5d89..7de7236 100644 --- a/libebl/ChangeLog +++ b/libebl/ChangeLog @@ -1,3 +1,8 @@ +2017-05-04 Ulf Hermann + + * eblopenbackend.c: On windows use an ORIGINDIR without $ORIGIN and + $LIB. + 2017-04-28 Ulf Hermann * Makefile.am: Forward LIBPREFIX and LIBEXT as defined by configure. diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c index 0b261e7..4048f12 100644 --- a/libebl/eblopenbackend.c +++ b/libebl/eblopenbackend.c @@ -312,7 +312,11 @@ openbackend (Elf *elf, const char *emulation, GElf_Half machine) #ifndef LIBEBL_SUBDIR # define LIBEBL_SUBDIR PACKAGE #endif +#if (defined _WIN32 || defined __WIN32__) +#define ORIGINDIR "..\\lib\\" LIBEBL_SUBDIR "\\" +#else #define ORIGINDIR "$ORIGIN/../$LIB/" LIBEBL_SUBDIR "/" +#endif #define LIBEBL_PREFIX LIBPREFIX "ebl_" /* Give it a try. At least the machine type matches. First -- 2.1.4