rpm: update to 4.17.0.
- lua is always required, so remove config arg - no longer uses Berkeley DB or NSS By ericonr: - clean up musl: add CFLAGS for gettext includes; add musl-legacy-compat to allow us to compile the libelf integration (was previously disabled on musl) - use >= for versioning deps Closes: #34219 [via git-merge-pr]
This commit is contained in:
mobinmob
Érico Nogueira
parent
5372bd8d95
commit
6427049d9e
|
|
@ -1,31 +0,0 @@
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl])
|
|
||||||
# Check for libelf library. Prefer external, otherwise none.
|
|
||||||
WITH_LIBELF_LIB=
|
|
||||||
AC_CHECK_HEADER([libelf.h])
|
|
||||||
+AC_CHECK_HEADERS([error.h], [WITH_ERROR_H=yes])
|
|
||||||
AC_CHECK_HEADERS([gelf.h], [
|
|
||||||
AC_CHECK_LIB(elf, gelf_getvernaux, [
|
|
||||||
AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
|
|
||||||
@@ -237,7 +238,7 @@ AC_CHECK_HEADERS([gelf.h], [
|
|
||||||
])
|
|
||||||
])
|
|
||||||
AC_SUBST(WITH_LIBELF_LIB)
|
|
||||||
-AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes])
|
|
||||||
+AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes])
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS([dwarf.h], [
|
|
||||||
WITH_LIBDWARF=yes
|
|
||||||
diff --git rpmio/digest_nss.c rpmio/digest_nss.c
|
|
||||||
index 992d9ac..5f43b57 100644
|
|
||||||
--- a/rpmio/digest_nss.c
|
|
||||||
+++ b/rpmio/digest_nss.c
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
#include <keyhi.h>
|
|
||||||
#include <cryptohi.h>
|
|
||||||
#include <blapit.h>
|
|
||||||
+#include <signal.h>
|
|
||||||
|
|
||||||
#include <rpm/rpmlog.h>
|
|
||||||
#include "rpmio/digest.h"
|
|
||||||
|
|
@ -1,37 +1,36 @@
|
||||||
# Template file for 'rpm'
|
# Template file for 'rpm'
|
||||||
pkgname=rpm
|
pkgname=rpm
|
||||||
version=4.16.1.3
|
version=4.17.0
|
||||||
revision=2
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
|
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
|
||||||
# until this is fixed upstream, manually define am_cv_python_version to circumvent
|
# until this is fixed upstream, manually define am_cv_python_version to circumvent
|
||||||
configure_args="--with-lua --with-cap --with-acl --with-external-db
|
configure_args="--with-cap --with-acl
|
||||||
--enable-python PYTHON=python3 --sharedstatedir=/var/lib
|
--enable-python PYTHON=python3 --sharedstatedir=/var/lib
|
||||||
am_cv_python_version=${py3_ver}"
|
am_cv_python_version=${py3_ver}"
|
||||||
hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
|
hostmakedepends="automake gettext-devel libtool pkg-config
|
||||||
python3-setuptools"
|
python3-setuptools"
|
||||||
makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
|
makedepends="libgcrypt-devel binutils-devel elfutils-devel file-devel libarchive-devel
|
||||||
libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
|
libcap-devel lua53-devel popt-devel python3-devel libgomp-devel sqlite-devel"
|
||||||
short_desc="Red Hat Package Management Utils"
|
short_desc="Red Hat Package Management Utils"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://rpm.org"
|
homepage="https://rpm.org"
|
||||||
changelog="https://rpm.org/wiki/Releases/${version}.html"
|
changelog="https://rpm.org/wiki/Releases/${version}.html"
|
||||||
distfiles="http://ftp.rpm.org/releases/rpm-4.16.x/rpm-${version}.tar.bz2"
|
distfiles="https://ftp.osuosl.org/pub/rpm/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
|
||||||
checksum=513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d
|
checksum=2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a
|
||||||
python_version=3
|
python_version=3
|
||||||
conflicts="rpmextract>=0" # Both provide rpm2cpio
|
conflicts="rpmextract>=0" # Both provide rpm2cpio
|
||||||
|
|
||||||
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
|
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
|
||||||
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss"
|
|
||||||
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr"
|
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
# Musl requires gettext to be included and it's cflag added otherwise
|
# rpm uses _nl_msg_cat_cntr, so it needs the glibc gettext impl
|
||||||
# it fails with _nl_msg_cat_cntr undefined reference error
|
# it uses <error.h> header, provided by legacy-compat
|
||||||
*-musl)
|
*-musl)
|
||||||
makedepends+=" gettext-devel"
|
makedepends+=" gettext-devel musl-legacy-compat"
|
||||||
LDFLAGS+=" -lintl"
|
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/gettext"
|
||||||
|
LDFLAGS="-lintl"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
@ -40,9 +39,9 @@ pre_configure() {
|
||||||
}
|
}
|
||||||
|
|
||||||
librpm-devel_package() {
|
librpm-devel_package() {
|
||||||
depends="librpm-${version}_${revision} librpmbuild-${version}_${revision}
|
depends="librpm>=${version}_${revision} librpmbuild>=${version}_${revision}
|
||||||
librpmsign-${version}_${revision} librpmio-${version}_${revision} db-devel
|
librpmsign>=${version}_${revision} librpmio>=${version}_${revision} sqlite-devel
|
||||||
popt-devel liblzma-devel zlib-devel bzip2-devel nss-devel lua52-devel"
|
popt-devel liblzma-devel zlib-devel bzip2-devel libgcrypt-devel lua53-devel"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
depends="${makedepends}"
|
depends="${makedepends}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue