Page MenuHomeFreeBSD
Files F102792484

D38092.diff
No OneTemporary
Actions

D38092.diff
View Options

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -11,13 +11,16 @@
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 @@
--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
--- /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
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -79,6 +79,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 6:36 AM (16 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14691414
Default Alt Text
D38092.diff (2 KB)

Event Timeline