From nobody Mon Jan 23 16:04:44 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0w0Y2Q8hz2v7sS; Mon, 23 Jan 2023 16:04:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0w0Y1tDyz3tXG; Mon, 23 Jan 2023 16:04:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674489885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gdq7y438rTilLtoz7uvWJ1z5Xz4MPd77sHioRiT6ihA=; b=jaRFPZ85NSJaoWg/6cc6nwpxbwY1Yu8ojjMCV/ENd0D0aALUj2depX5I9/z3DW6MQXRT73 +BrI9+P6hNJm2H8XBootNmpOLc4o27OIECjQCBSssBsfvS8xx1d3h7SCRAEL6SXpmnFRvx Avsm7XF2WiLVf/fre2U/R+nPPrgE8YBypx3vnnWC5QQn4TKpgqw6T/BFEXpuG0184p3iXU hdtddyXkBJzhwoN8aWWoLZV/W/Vri+Ly9IF+tE6viW4E5oYRLTdOkTJz69mEIeY4PuaSFE gm9lbTmbvRvDYKW+iPi+EYB3Kptv4C8nYOB1uUveinrgwhX2q/A0lSxGpMwIug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674489885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gdq7y438rTilLtoz7uvWJ1z5Xz4MPd77sHioRiT6ihA=; b=qlrFEx1QHbnBiSE24iUOqmsiZdc4bPJGOfx87TLg9FA58gF+5+NYN02Nl+nFC7ie+TtnMS XrQLYE2VMN7YXuQbkf5QTya9BDkRyi2sC1XqoC6xrd7ytMzH0z9jdjvh1KbR2+JHHqbe8i jTtoeOdFcN/9EbhFUM2Z9cX7n7ogfxSpkR3UESGgAccidU6TipMoG7MI7IrlvjKRK8oSpP VmCnLrXr3xTTXloVLHEKKRCElkwWHreun7N9QnbqIqJJ/sLRCSvMmb8Wxgc4eOUDScQhRM C3adhSJUeuX0HvPYwF5bwLDeUqsBnGcqc17EHSMzvv2IcREcyIRxvBtKHgYHxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674489885; a=rsa-sha256; cv=none; b=ozx6m6iU3cv7eYzpJ22jZHwhTsbm6CGP0AKxkHlmrhFpB1gjBHI2SuCqSkUgzet3jmhP5+ mHuOmteEr4YYO2VdbfYzv8YyZknW1yIlA9sbcmBKKGvwtqxbKj5ZS/DlTpcNskpwp/Gojo PPRJmBe70BaXGg5llUab02iZJX8s78YKRWhtoiiZloipOCvHHJuNtbXHOY9/+HoUPfR+RM J2r7sWBeGpvSmEd9os7DnblhhXmf0Od9fjRCpB4eDNkDPkgJk/1bnKRPvjjWpdStZ6Xxnd Wf0r9lTZwqzBKopqGI/kvnUWk9uUVty+DIFHTB80j3TP7VtINoG2s08Fa1TFog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P0w0Y0QbmzZBk; Mon, 23 Jan 2023 16:04:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NG4i0p087528; Mon, 23 Jan 2023 16:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NG4iW8087527; Mon, 23 Jan 2023 16:04:44 GMT (envelope-from git) Date: Mon, 23 Jan 2023 16:04:44 GMT Message-Id: <202301231604.30NG4iW8087527@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Johnston Subject: git: e5c98e356920 - main - archivers/rpm4: re-enable the build of the bundled elfdeps utility List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5c98e35692008f9633e768e2875d93b9dc93a25 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=e5c98e35692008f9633e768e2875d93b9dc93a25 commit e5c98e35692008f9633e768e2875d93b9dc93a25 Author: Mark Johnston AuthorDate: 2023-01-16 21:47:03 +0000 Commit: Mark Johnston CommitDate: 2023-01-23 16:04:36 +0000 archivers/rpm4: re-enable the build of the bundled elfdeps utility Commit 5ff99a4c9df9 disabled libelf detection to work around the build failure, but rpmbuild expects to be able to find the elfdeps utility and misbehaves when it's not present. Since the build failure is easy to address (different names for an ELF machine type constant for the rather obsolescent DEC Alpha), let's just do that. As a part of this, elfutils must be listed as a runtime dependency. Note that we cannot list it in LIB_DEPENDS since the ports framework ends up finding the base system libelf.so and decides that the dependency is satisifed without installing elfutils. But the base system libelf is missing a symbol (gelf_getvernaux) required by elfdeps. Work around this by listing elfutils as both build and runtime dependencies. Approved by: rodrigo Reviewed by: rodrigo Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38092 --- archivers/rpm4/Makefile | 12 +++++++----- archivers/rpm4/files/patch-tools_elfdeps.c | 11 +++++++++++ archivers/rpm4/pkg-plist | 1 + 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 716ac758cda1..adbe2a427321 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -11,13 +11,16 @@ WWW= https://rpm.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gsed:textproc/gsed +BUILD_DEPENDS= gsed:textproc/gsed \ + ${LOCALBASE}/lib/libelf.so:devel/elfutils LIB_DEPENDS= libpopt.so:devel/popt \ libnss3.so:security/nss \ libzstd.so:archivers/zstd \ - libgcrypt.so:security/libgcrypt + libgcrypt.so:security/libgcrypt \ + libelf.so:devel/elfutils RUN_DEPENDS= bash:shells/bash \ - gxargs:misc/findutils + gxargs:misc/findutils \ + ${LOCALBASE}/lib/libelf.so:devel/elfutils USES= alias bdb sqlite cpe gmake iconv libarchive libtool \ lua pathfix pkgconfig shebangfix tar:bzip2 @@ -35,8 +38,7 @@ CONFIGURE_ARGS= --enable-sqlite=yes\ --sysconfdir=${PREFIX}/etc \ --localstatedir=/var \ --without-javaglue \ - am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER} \ - ac_cv_lib_elf_gelf_getvernaux=no # otherwise fails to build in presence of devel/elfutils + am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER} CONFIGURE_ENV= LUA_CFLAGS=-I${LUA_INCDIR} \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm" INSTALL_TARGET= install-strip diff --git a/archivers/rpm4/files/patch-tools_elfdeps.c b/archivers/rpm4/files/patch-tools_elfdeps.c new file mode 100644 index 000000000000..6f71f12f4c9e --- /dev/null +++ b/archivers/rpm4/files/patch-tools_elfdeps.c @@ -0,0 +1,11 @@ +--- tools/elfdeps.c.orig 2023-01-16 16:44:45.666870000 -0500 ++++ tools/elfdeps.c 2023-01-16 16:44:57.548011000 -0500 +@@ -84,7 +84,7 @@ + if (ehdr->e_ident[EI_CLASS] == ELFCLASS64) { + switch (ehdr->e_machine) { + case EM_ALPHA: +- case EM_FAKE_ALPHA: ++ case EM_ALPHA_STD: + /* alpha doesn't traditionally have 64bit markers */ + break; + default: diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index 44b26c0610da..091cc43e8a86 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -79,6 +79,7 @@ lib/rpm/check-files lib/rpm/check-prereqs lib/rpm/check-rpaths lib/rpm/check-rpaths-worker +lib/rpm/elfdeps lib/rpm/fileattrs/debuginfo.attr lib/rpm/fileattrs/desktop.attr lib/rpm/fileattrs/elf.attr