From patchwork Tue Oct 22 13:03:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 99324 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 85FCC3858C98 for ; Tue, 22 Oct 2024 13:04:01 +0000 (GMT) X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 11C6D3858D21 for ; Tue, 22 Oct 2024 13:03:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11C6D3858D21 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 11C6D3858D21 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729602231; cv=none; b=H/VuDeQxPqvCRxVRR5cCqgn4UF7Owcz+ajp/H1GxC9wGf0fxHhAfzwz7tnZhKgP8la+g/rGQbTDKw+kK5IKZxT/EQHcCdCvz7MJnqwDXvOdfU7YcpUmS/hzMPt1KOGCoT40ypK9plUdYmQ+mWR8FtZP8PY62f6k0EVdv/6CF4A0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729602231; c=relaxed/simple; bh=KyMEXBLvPo6OMGTzTCUZmsgIJNs2+9R0B7K4S5DZPnI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=M2Kr/ESzW2TQnLI8Fw3McdoMkguDCeZJCjGvImH6eFgddrzNNPlHuLdKG+yUksi9Vmfh3HgdHOPozveWW11UaBTD8vUHXdCkX3b+QdhDO+T0zO0KGCIcLIyGA0XfMnQg2ZJbcJiY7gUxDJAKiARji9uTbADNHDliz8LhIlgZo9g= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from r6.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl [82.217.174.174]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 57620303AA0D; Tue, 22 Oct 2024 15:03:47 +0200 (CEST) Received: by r6.localdomain (Postfix, from userid 1000) id EF1033406CE; Tue, 22 Oct 2024 15:03:46 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [PATCH] libelf: Add libeu objects to libelf.a static archive Date: Tue, 22 Oct 2024 15:03:42 +0200 Message-ID: <20241022130343.1658267-1-mark@klomp.org> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: elfutils-devel-bounces~patchwork=sourceware.org@sourceware.org libelf might use some symbols from libeu.a, specifically the eu-search wrappers. But we don't ship libeu.a separately. So include the libeu objects in the libelf.a archive to facilitate static linking. * libelf/Makefile.am (libeu_objects): New variable. (libelf_a_LIBADD): New, add libeu_objects. https://sourceware.org/bugzilla/show_bug.cgi?id=32293 Signed-off-by: Mark Wielaard --- libelf/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 3402863ef174..2d3dbdf22756 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -122,6 +122,9 @@ libelf.so: $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS) @$(textrel_check) $(AM_V_at)ln -fs $@ $@.$(VERSION) +libeu_objects = $(shell $(AR) t ../lib/libeu.a) +libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects)) + install: install-am libelf.so $(mkinstalldirs) $(DESTDIR)$(libdir) $(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so