PR#1: groups/{020.host_deps_rpm,231.native_packages_etc}.group: rpm: drop LMDB rpmdb support - build/midipix_build

build / midipix_build

#1 groups/{020.host_deps_rpm,231.native_packages_etc}.group: rpm: drop LMDB rpmdb support

Merged 3 years ago by lalbornoz. Opened 3 years ago by Conan_Kudo.

Unknown source rpm-rm-lmdb-rpmdb-support into main

groups/{020.host_deps_rpm,231.native_packages_etc}.group: rpm: drop LMDB rpmdb support

Neal Gompa • 3 years ago

76f74d

groups/020.host_deps_rpm.group

file modified

+3 -5

		`@@ -9,7 +9,7 @@`
		`HOST_DEPS_RPM_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";`
		`HOST_DEPS_RPM_MAKEFLAGS_INSTALL_EXTRA="prefix= PREFIX=";`
		`HOST_DEPS_RPM_PACKAGES="`
		`- libarchive_host lmdb_host popt_host rpm_host";`
		`+ libarchive_host popt_host rpm_host";`
		`HOST_DEPS_RPM_PKG_CONFIG="${PREFIX}/bin/pkgconf";`
		`HOST_DEPS_RPM_PREFIX="${PREFIX}";`
		`: ${PKG_LIBARCHIVE_HOST_SHA256SUM:=b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176};`
		`@@ -18,17 +18,15 @@`
		`: ${PKG_LIBARCHIVE_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};`
		`: ${PKG_LIBARCHIVE_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"};`
		`: ${PKG_LIBARCHIVE_HOST_LIBTOOL:=rdlibtool};`
		`- : ${PKG_LMDB_HOST_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"};`
		`- : ${PKG_LMDB_HOST_IN_TREE:=1};`
		`: ${PKG_POPT_HOST_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8};`
		`: ${PKG_POPT_HOST_VERSION:=1.16};`
		`: ${PKG_POPT_HOST_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/popt/popt-${PKG_POPT_HOST_VERSION}.tar.gz};`
		`- : ${PKG_RPM_HOST_DEPENDS:="libarchive_host lmdb_host popt_host"};`
		`+ : ${PKG_RPM_HOST_DEPENDS:="libarchive_host popt_host"};`
		`: ${PKG_RPM_HOST_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230};`
		`: ${PKG_RPM_HOST_VERSION:=4.15.1};`
		`: ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2};`
		`: ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -I${PREFIX}/include/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include"};`
		`- : ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bdb=no --enable-ndb --enable-lmdb --with-crypto=openssl --with-vendor=midipix --without-lua"};`
		`+ : ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bdb=no --enable-ndb --with-crypto=openssl --with-vendor=midipix --without-lua"};`
		`: ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"};`

		`# vim:filetype=sh textwidth=0`

groups/231.native_packages_etc.group

file modified

+3 -5

		`@@ -6,7 +6,7 @@`
		`alsa_lib apr apr_util bdwgc bmake bochs bzip2 clzip cmake cron dante dbus`
		`debianutils emacs expat ffmpeg file gdbm geoip gettext_tiny ghostscript`
		`giflib gnuchess gzip hastyhex hexcurse htop imagemagick infounzip infozip`
		`- john lcms2 less lmdb lolcode mintty mlogin musl_compat musl_fts ncdu`
		`+ john lcms2 less lolcode mintty mlogin musl_compat musl_fts ncdu`
		`ncurses ncursestw ncursesw npth openjpeg p7zip pcre popt procps_ng qemu`
		`qpdf qrencode rpm rw shared_mime_info slang sqlite3 tcl tdnf texinfo`
		`tiff tmux tzdb utf8proc util_linux vim w32api w32lib xorriso xz yabasic`
		`@@ -175,8 +175,6 @@`
		`: ${PKG_LESS_SHA256SUM:=ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d};`
		`: ${PKG_LESS_VERSION:=551};`
		`: ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz};`
		`- : ${PKG_LMDB_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"};`
		`- : ${PKG_LMDB_IN_TREE:=1};`
		`: ${PKG_LOLCODE_URLS_GIT:="lci=https://github.com/justinmeza/lci.git@master"};`
		`: ${PKG_LOLCODE_BUILD_DIR:=lci};`
		`: ${PKG_MINTTY_DEPENDS:="w32api w32lib"};`
		`@@ -257,11 +255,11 @@`
		`: ${PKG_QRENCODE_VERSION:=3.4.4};`
		`: ${PKG_QRENCODE_URL:=https://fukuchi.org/works/qrencode/qrencode-${PKG_QRENCODE_VERSION}.tar.bz2};`
		`: ${PKG_QRENCODE_CONFIGURE_ARGS_EXTRA:=--disable-sdltest};`
		`- : ${PKG_RPM_DEPENDS:="curl dbus file libarchive libgcrypt libz lmdb lua popt"};`
		`+ : ${PKG_RPM_DEPENDS:="curl dbus file libarchive libgcrypt libz lua popt"};`
		`: ${PKG_RPM_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230};`
		`: ${PKG_RPM_VERSION:=4.15.1};`
		`: ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2};`
		`- : ${PKG_RPM_CONFIGURE_ARGS_EXTRA:="--with-lua --enable-ndb --enable-lmdb --disable-bdb --with-crypto=libgcrypt --with-vendor=midipix"};`
		`+ : ${PKG_RPM_CONFIGURE_ARGS_EXTRA:="--with-lua --enable-ndb --disable-bdb --with-crypto=libgcrypt --with-vendor=midipix"};`
		`: ${PKG_RPM_ENV_VARS_EXTRA:="LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"};`
		`: ${PKG_RW_SHA256SUM:=50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d};`
		`: ${PKG_RW_VERSION:=1.0};`

Conan_Kudo commented 3 years ago

Upstream rpm has ripped out support for LMDB-based rpmdb due to underlying flaws in
LMDB and lack of desire by the LMDB project to resolve them. We already prefer NDB
anyway, and this lets us drop a dependency we do not use anywhere else.

Signed-off-by: Neal Gompa ngompa13@gmail.com