From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28160 invoked by alias); 28 Apr 2017 11:10:26 -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 28120 invoked by uid 89); 28 Apr 2017 11:10:24 -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,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,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-VE1-obe.outbound.protection.outlook.com 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=ypUFB8AUXFKCLSDv4Mvv+xbp8LSI6e3/wmcyuBU5r48=; b=syt26EhYFBNzQkhZEPHV2D58bieXzkqR/I4oP+vLIoTPcMwJvT/hstaFaSMGdY4qK2T7mFqUH992uWrSc2F8Onj56S2Wdq6wkzBGsifGlSMNzOUJMRsO8pjYGcySJCBX95Os1uQ5FHT6AEsraqomYe6bFUwr44ZyiHlZb79R/nM= Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io; From: Ulf Hermann Subject: [PATCH] Check if we need -lintl for linking gettext To: Message-ID: <59ef3e19-9d5d-93da-76ce-912e8aac5f47@qt.io> Date: Fri, 28 Apr 2017 11:58: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: DB6PR07CA0164.eurprd07.prod.outlook.com (2603:10a6:6:43::18) To AMSPR02MB230.eurprd02.prod.outlook.com (2a01:111:e400:8022::17) X-MS-Office365-Filtering-Correlation-Id: bbddee9c-d54e-47cf-2b4c-08d48e2727f7 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:AMSPR02MB230; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;3:5HexlzXLtAOe37koEKEDYN2+v8cXLmBUvgNwuEv+M4HqJ3rTY0IhZc/0IWmKSQ9oYTyiElA6YuCriAeFr9e1giakrdS/84HT/B2owj53KvfsNI431KcN4S69LgXkKtFi0JtAdbwF+QrVYp2nmqI0WIdDovm60x5ciSuP6EpFTeTyyBvu0Lc7OHPF0zdRlP7QH0JzpMnZvg7u4y7LqR2JQiTc2Zuo1dmM5quG9OyY70zB+tE8FmZSS7YDH/ZOrV2PSzn++8SckDHZZVpm76adWkzxmHHKrA/gj+WOuoc2YJtzLi3tnyeFV3nwMQKhyRBCLrnDcWpuLP5hYi6eVnxybA==;25:7r80t0Iojle/V6TrnDbcyX5JanOPq84taAVV+KyJ0z5B5P5bQIU5BC8c8fXXdw7yoBKI4r/JV72kXzK21xXdr2zaxrQ5qSl7ZyRzMx0a9G0Hcx/nNRxmdHFyzzYlIPg75/ZJvTHJk3xn0i/QI0FcUwgAAl4sMCchzo0Cq0YJYJj1Apy7xlWatXK63Tvd3+Fpkzbqr/B7lqGGHAgKV5T32W1kBwNojwre1vkeLoHqpYr1rnbDVzxbU7z/nuSrY0ZSYmbZA6l9Np3jp0YLKEXbq5cYYtTvej0+4QGrOJozHkDU7uakWqiZBqi/dhfdMZXQkNk6vjzZWTYMI2jgI2sifpQnkecEfFFgZx8a43uygRjpswzL0RVa/4NTK8A0jINU6J5eJGYxr4sEwVUSiCtdPi+k8d6e4A5Oz9U0oAkCWMfzJ765HfTurZysNwhiPqPfbcPb4Ae8fLFj+Vu5PJ+puA== X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;31:cPDWzs4MyY/tTBpRbsI8SS7dBL0e4Gi75/zLJmxD2Po96y2kNVD/JoWYplDafgwGul44Go3MF8DWEeGs2VX6WQM0QdCWzkL4N14JUhOHCdvefCVhDiiT3cO0KolDUYHZCWEKhxnc8uT5+/9UGiTDmCkkTlE7cvyuGB6bN3H6C+5ZnDsAciF20mETXN18yZ/1TycLBFKyCVp9KDv5jx3qON6lfLpYuaJa9ZZboIewX30L2Kq9KAk5+APdhx0cGA6mSmk2ODel8t3TkKr7qyYQbQ==;20:etAl6y0isihBS8JaHN/+pmhlY3MohRsrmzSOeb9rpn64eTNT+nP0TjauzmVVsvZhoj7QiOAXwiypQBO9A9H6DzpWcVsE+g6PtPZgx5CRAJK8hoSWNeYOBvPBQbx+C95JckCYx9JkV3XK4nPVUxNUKSl1XhTtkmI0dMOnmuXPDET5D7gRBnMDTOLPnnc5VysfLHnwZwkNuagBl2AD40kABU3c3UIa7kspVGq8hnTMR1sCdOyk+FVrojG4LHnkUKcL 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)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(6072148);SRVR:AMSPR02MB230;BCL:0;PCL:0;RULEID:;SRVR:AMSPR02MB230; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;4:5tqPzUuYSTPu9uH1J2aQbT/ZQFoeg4NTCW+LM+sVbmqElOwUD4MYS4PDVKgPCJsOwcnvOBJMWjKThMDhwH2flkn14qAKgKdnldu/7SU95/MZ5Zc5lHVVhnFA1g8GR+JTrEJGqL2FpTch4krNXhsxNM5IZ46qG65rUJ/MA6WK6ANMsqi4WUOMsWUkYcuetC/AAH6IF/QUBCpqsXMO2XIQ/0V9cMXOYW8FWsiI3wmEeAarOQjRZrTmNvSvyZ5db8DBP1WddkvuXkhxAnmL1XpSAf56p8NDpXVCfzktqTkmbo+B0YqcOC13Tohil3DHjTBIicEuNxh0jGjqV7PCNSUFhwMIiYX/V48CnIx40S5VcJXxlD0lvE+kNC04htn28HXOHWgr7ZiwHORFQcA5/sl7rVEpvoI0k85ZbXoQph3xhFNhjLxbGpJ/6/UYU3P81xA+lTUb+IJjE4/H3gyMVxrcodf29MXzaL+EJTdYkFOs+Y1g7z9wfp+7brCIR84f0ZSYUTuGVfRnFLdQtWkNco+Jg5uMGqPlVpOz6PFmeaO+Qz15o35htvlZ0GvR4k8aFTOM7BIjhqS2NMiwBsHC8U9m5f9Y8IeGNFpwC5gQphasHt5yfj7FucS9ep+SkgxLJmPsZqbu0R1dgXNIBp+D/SwSK1iKGgTPUXCKb90TkoQvmOMq57PGEwSoBE4UwyjJuGc7o4A9g545QDSQ5pDYZ/VPi5GnEq2ZikKvTvXTmndBOFMfD/3SqUss38TUHhyksuHm2xyQBUHT65LYomtDNTvyVG0RPrUrDIm1F2pMglabmsg= X-Forefront-PRVS: 029174C036 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(39450400003)(39410400002)(39830400002)(39400400002)(377424004)(6916009)(74482002)(5660300001)(65826007)(23676002)(6486002)(77096006)(53936002)(83506001)(7736002)(86362001)(305945005)(575784001)(50466002)(36756003)(31696002)(25786009)(47776003)(3846002)(65956001)(66066001)(50986999)(38730400002)(33646002)(110136004)(230700001)(2351001)(31686004)(42186005)(2906002)(81166006)(54356999)(6116002)(189998001)(4001350100001)(8676002);DIR:OUT;SFP:1102;SCL:1;SRVR:AMSPR02MB230;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTVNQUjAyTUIyMzA7MjM6OW5zTWV1YVFEV09sU0ZGOE9PZTF4Y0JpYjdu?= =?utf-8?B?N0lWd084RUdlTjZPcTltZENtUWdvaWJwOEtucVAzZEZ2ZS9JOG9MMGg1L0pw?= =?utf-8?B?d1dQdWRiZFV4NHNFTndLREFadEVHMXRSUG9DNTZjbmlTRWtQc3pRQWVjTzVE?= =?utf-8?B?ZkoxN0NucnY3cG5KanZGTUk1aDdNSG9SNi8vQVh0VVBhTkVYMUg3Mld0T0RB?= =?utf-8?B?bEdMY3JqWkJPN05UMTBwYlovZ3RjRjZLWm05Z2s1UVBLV0lVZzhJZk5MblNo?= =?utf-8?B?Qm5CRjNRZTJrUTJEYit5eTFOcGQ0QmZVWE1NaVJ1YVo3YjlCaFlrZFlmZlRL?= =?utf-8?B?VmFqVTBoamNoNW1mdHBXWklvdncxNDQ4eVhIb1k3UWRRbTA1QXVkZ21HNk9K?= =?utf-8?B?RUdwd1pJd0NjaG9lNnpBaTY2aFB4NEtKazdxU1dvMXJVYUJBbXM2cEtYZFZW?= =?utf-8?B?WDRpMzdocklncHp6eDhQTkx2Mk1mVTdhQldtbTM0Y1M2SEtHTFJrS0hQN1NC?= =?utf-8?B?ZHI0MWVyQXNsU1hxTVpJcXREUG9DaVFMeDY4amErY1VZQW9RRzZSR0s4NDBB?= =?utf-8?B?MTVwa3BnbmtZSFRueDJwYW4vd1U3c0JaSjdYayt0NGd3dWJBeVpHRFZIWElC?= =?utf-8?B?aTVaWS9IRlRCRUVXTWlJdUQrNnppSU44eTc4dWtFeXMvelliL1pIMXVyZ1ZU?= =?utf-8?B?T1EwcjZJdHIrWHRwQkVVM01SdktURm5Pd3BNYmtGTW9HemFkUmh1TGk3WmJ3?= =?utf-8?B?TjVUcHJNUVlnZ1lkOUxrRDhLc3JCN1ZBcm9uRVQ0ZXpRdnZXejZUVHlKaVY5?= =?utf-8?B?aXJOMXZkM2xxdkUzdXptK0J3UXorL0FnaWRjNE8yWGxoKzcxSjB1ZGlvUjFD?= =?utf-8?B?cjlIR0lMdnpMRjlPNGZVdXZSdjNpb3F1emt0MzhyK05tQ2s1d2preGhRY0RD?= =?utf-8?B?OFIwanlLQXJXZHNKQkpDcGlaRGVGR09wTTVjM3RQV1JXUitDNzRBd1ZBLzVR?= =?utf-8?B?UUgwejg1T3prM242Ui82N1B1UGYrQjl4aEt5ZlVlcXlHWXdIWko5MVVUR2xH?= =?utf-8?B?RFlOY1dTQ0l4NUJYVFFyY1RneWtWZXcyVUxBd2t5SE42WGJIZndFcnZyckRl?= =?utf-8?B?YXUxN1UxNms0MXpxdlZldGZEM1Q1S1JtanphZXZIMUlOQmFLYndMYVRMWFYv?= =?utf-8?B?WUVyUTdJcnNHSWIrQWNFV0RuVGpWSEtUNTRlS2RwbHQ2aEdaWmNEY2lielVq?= =?utf-8?B?dVNYQ1pBMTBlSVpnSmFLUjR0MkZlaXA2VWVZekZwcC9rUHJTdE9LNlpnK0xz?= =?utf-8?B?S0llYnROOHNmNi9CY1liNmV4R1dHRUp3TzRDQUdraElJeDZMTWZGR2RNM0FD?= =?utf-8?B?c0lZY1RuMHUyVnZOd1J1RlhjVEh1dDZxNklrRUhGQXFpNUE2UmxKaGYxRHZr?= =?utf-8?B?RHRNM3ovc21DMkYzNks3WHZRUGdUSEN1eFZvQnZzMitndm0rVFBhKzVzS29y?= =?utf-8?Q?Yf+5y7P73aW7y4G6qCcXJ2RA=3D?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;6:4NM3+Zbv8AmxQKIDZL9OwcOuapbliqtPdp1km4ugc4qkGjwFY+GPRHALVdhJogbd1ytl4VKIc87aj2B3qW6mLSCGW8wsIKZbbiMLBzxN1T49A8qshgVP7rYUI5r73RyjAkwZXjjHTd7teDDncHciatLkrWIxnRkKEdHFnjvKDCk3vGsFMk12qspf1F+iG4s4ODdxEC9++R89Z36x4YqFXWoO4kIXrs2BoKpXS5yKv/YFlLvHha18OBblzPwD3x5jzTfkd1BKY+NWYbgAg/qWlQv18J5CwTsCMjk9dzHpgEiH6DSGmg6wzaqqS9M4hEOxoZhzannC4sXPT2znx0yiM8XdipQLpKfAqFtYeBUm0COFbqo87Tf6vqci7LfCMLUr5GnSNZ2VZ+6sB6bA4JnQq5BLwKQqAe4B+qB3+dtiC9oF8WMScFftQVOAic2CA/3in5IVLnK87ConjMafjy/icHb0KFqmqpzifOC6B6w/pnRCT/GcoLyq9cl9SgIV893RO9fAay2NbOupHxtvUX9qqw==;5:rcjrvOJLK86idaoFBvtiqJpWbAF/QekWyc1kAQnsRXYxGWCAxLxp2AEOezR0NaeGsWfMzwgZjP7qvvRa8OSctO9th0Pfx3BPAx01UOnU//AwTiCgNkpwi18Xw4EgGr90x9qa946CWtkXepmAZAjdPQ==;24:38j3x6k38zuueNeLnEWcnbuunOcRbBzK6jjUKceQPuefFJWjizP6Qi23EiaGyvu9MZm4s7uAuZVAdLnqxPXqzHe/eWh0iAzXPP/lrMD2Djg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;7:vjVE2dXzdzTADeaW0ac03ErIzLJ+tcEwgT9I06/VwLhKLaFul4VcAr58D4BKV/ELIuHh601v80I4Hv19dLfo1gkynhL/58UFYbDUxR1SeNdRymJgAX+SWG1wi+SwYI02JYhZkqHWZ1OsTFmhMLk8OQErwv3BOr+dbOgJURZSufTIHM9t6pVzGCSwAC8EhESPDYpJe88fsOM2Oxv3rNXevFPf9r89BhtG4MKi0+xcWczAn60Jfknwe0zks80KcR5UvmgfUtjzLkTW119T3WWEo3HWeRblgsF2N4sZtCNKmfSrYQdBXVW8l/u8pUywGCJJtmzRpzQmJbW6guOOi+8HdQ== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2017 11:10:18.9742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR02MB230 X-SW-Source: 2017-q2/txt/msg00123.txt.bz2 We might not have gettext available from libc and we cannot get it from gnulib either. Signed-off-by: Ulf Hermann --- ChangeLog | 5 +++++ backends/ChangeLog | 4 ++++ backends/Makefile.am | 2 +- configure.ac | 25 +++++++++++++++++++++++++ libasm/ChangeLog | 4 ++++ libasm/Makefile.am | 2 +- libcpu/ChangeLog | 4 ++++ libcpu/Makefile.am | 2 +- libdw/ChangeLog | 4 ++++ libdw/Makefile.am | 2 +- libelf/ChangeLog | 4 ++++ libelf/Makefile.am | 2 +- src/ChangeLog | 4 ++++ src/Makefile.am | 30 +++++++++++++++--------------- tests/ChangeLog | 4 ++++ tests/Makefile.am | 18 +++++++++--------- 16 files changed, 87 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01f88f3..ccfb3ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-04-28 Ulf Hermann + + * configure.ac: Check for availability of dgettext from either libc or + a separate libintl. + 2017-04-27 Ulf Hermann * configure.ac: Check if the compiler supports diff --git a/backends/ChangeLog b/backends/ChangeLog index baeb7b9..a35d83a 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,7 @@ +2017-04-28 Ulf Hermann + + * Makefile.am: Use intl_LDADD. + 2017-04-27 Ulf Hermann * Makefile.am: Use dso_LDFLAGS. diff --git a/backends/Makefile.am b/backends/Makefile.am index 3e1992e..6dc2022 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -141,7 +141,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libgnu) $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $(@:.map=.so) \ -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ -Wl,--version-script,$(@:.so=.map) \ - -Wl,--as-needed $(libelf) $(libdw) $(libgnu) + -Wl,--as-needed $(libelf) $(libdw) $(libgnu) $(intl_LDADD) @$(textrel_check) libebl_i386.so: $(cpu_i386) diff --git a/configure.ac b/configure.ac index 165149d..0266a36 100644 --- a/configure.ac +++ b/configure.ac @@ -431,6 +431,31 @@ CFLAGS="$old_CFLAGS"]) AM_CONDITIONAL(HAVE_IMPLICIT_FALLTHROUGH_WARNING, [test "x$ac_cv_implicit_fallthrough" != "xno"]) +dnl Check if gettext is available form libc +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [dgettext("foo", "bar"); return 0;] + )], + [libc_has_gettext="true"], + [libc_has_gettext="false"] +) + +dnl If our libc doesn't provide gettext, then test for libintl +if test "$libc_has_gettext" = "false" ; then + AC_MSG_WARN("libc does not have gettext") + AC_CHECK_LIB([intl], [dgettext], [have_intl="true"], [have_intl="false"], [-liconv]) + + if test "$have_intl" = "false"; then + AC_MSG_ERROR("no libintl found") + else + intl_LDADD="-lintl -liconv" + fi +else + intl_LDADD="" +fi +AC_SUBST([intl_LDADD]) + 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/libasm/ChangeLog b/libasm/ChangeLog index 971492a..066c64e 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,7 @@ +2017-02-28 Ulf Hermann + + * Makefile.am: Use intl_LDADD. + 2017-02-27 Ulf Hermann * Makefile.am: Use dso_LDFLAGS. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index a5fc9fc..30f7fa9 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -55,7 +55,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ libasm_pic_a_SOURCES = am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) -libasm_so_LDLIBS = +libasm_so_LDLIBS = $(intl_LDADD) if USE_LOCKS libasm_so_LDLIBS += -lpthread endif diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index ef5da58..42cfb58 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2017-02-28 Ulf Hermann + + * Makefile.am: Use intl_LDADD. + 2017-02-27 Ulf Hermann * Makefile.am: Use fpic_CFLAGS. diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 9ca0f43..d277583 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -90,7 +90,7 @@ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare i386_parse.o: i386_parse.c i386.mnemonics i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`" i386_lex.o: i386_parse.h -i386_gendis_LDADD = $(libeu) $(libgnu) -lm +i386_gendis_LDADD = $(libeu) $(libgnu) $(intl_LDADD) -lm i386_parse.h: i386_parse.c ; diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 79c3898..7c6e19a 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2017-02-28 Ulf Hermann + + * Makefile.am: Use intl_LDADD. + 2017-02-27 Ulf Hermann * libdwP.h: Use attribute_hidden. diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 7b69f6a..31f7012 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -118,7 +118,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ -Wl,--version-script,$<,--no-undefined \ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ - -ldl -lz $(zip_LIBS) $(libgnu) + -ldl -lz $(intl_LDADD) $(zip_LIBS) $(libgnu) @$(textrel_check) $(AM_V_at)ln -fs $@ $@.$(VERSION) diff --git a/libelf/ChangeLog b/libelf/ChangeLog index fd58ed3..2894ecd 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2017-02-28 Ulf Hermann + + * Makefile.am: Use intl_LDADD. + 2017-04-27 Ulf Hermann * libelfP.h: Use attribute_hidden. diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 78d6853..64687b7 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -95,7 +95,7 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ libelf_pic_a_SOURCES = am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) -libelf_so_LDLIBS = -lz +libelf_so_LDLIBS = -lz $(intl_LDADD) if USE_LOCKS libelf_so_LDLIBS += -lpthread endif diff --git a/src/ChangeLog b/src/ChangeLog index c5805c9..b6bf70c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2017-02-28 Ulf Hermann + + * Makefile.am: Use intl_LDADD. + 2017-04-27 Ulf Hermann * Makefile.am: Drop argp_LDADD. diff --git a/src/Makefile.am b/src/Makefile.am index aca4b1c..a330959 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,22 +72,22 @@ ranlib_no_Wstack_usage = yes ar_no_Wstack_usage = yes unstrip_no_Wstack_usage = yes -readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) -ldl -nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) -ldl \ +readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) $(intl_LDADD) -ldl +nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) $(intl_LDADD) -ldl \ $(demanglelib) -size_LDADD = $(libelf) $(libeu) $(libgnu) -strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) -ldl -elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) -ldl -findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) -addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) $(demanglelib) -elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) -ldl -objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libgnu) -ldl -ranlib_LDADD = libar.a $(libelf) $(libeu) $(libgnu) -strings_LDADD = $(libelf) $(libeu) $(libgnu) -ar_LDADD = libar.a $(libelf) $(libeu) $(libgnu) -unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) -ldl -stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) -ldl $(demanglelib) -elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) +size_LDADD = $(libelf) $(libeu) $(libgnu) $(intl_LDADD) +strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(intl_LDADD) -ldl +elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) $(intl_LDADD) -ldl +findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) $(intl_LDADD) +addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) $(intl_LDADD) $(demanglelib) +elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) $(intl_LDADD) -ldl +objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libgnu) $(intl_LDADD) -ldl +ranlib_LDADD = libar.a $(libelf) $(libeu) $(libgnu) $(intl_LDADD) +strings_LDADD = $(libelf) $(libeu) $(libgnu) $(intl_LDADD) +ar_LDADD = libar.a $(libelf) $(libeu) $(libgnu) $(intl_LDADD) +unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(intl_LDADD) -ldl +stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(intl_LDADD) -ldl $(demanglelib) +elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(intl_LDADD) installcheck-binPROGRAMS: $(bin_PROGRAMS) bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ diff --git a/tests/ChangeLog b/tests/ChangeLog index 9d20341..1d347f6 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2017-02-28 Ulf Hermann + + * Makefile.am: Use intl_LDADD. + 2017-04-27 Ulf Hermann * Makefile.am: Use fpie_CFLAGS and fpic_CFLAGS. diff --git a/tests/Makefile.am b/tests/Makefile.am index 7258069..f9b556d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -433,15 +433,15 @@ funcretval_LDADD = $(libdw) $(libgnu) allregs_LDADD = $(libdw) $(libgnu) find_prologues_LDADD = $(libdw) $(libgnu) #show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) -asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl +asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl +asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) $(intl_LDADD) -ldl dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl rdwrmmap_LDADD = $(libelf) $(libgnu) dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl -- 2.1.4