summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2018-05-02 15:41:03 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2018-05-02 15:41:03 +0000
commitd04a9c0e65d45958d29bce94063e3c33376c135c (patch)
treefb0ed90e1c708ed6da6822f0f99cb6252ad6e1db
parentb71189f2e9308a977a79aad52dd5b6b3e733f8a9 (diff)
downloadmidipix_build-d04a9c0e65d45958d29bce94063e3c33376c135c.tar.bz2
midipix_build-d04a9c0e65d45958d29bce94063e3c33376c135c.tar.xz
patches/rpm-4.14.1.local.patch: via Redfoxmoon.
-rw-r--r--patches/rpm-4.14.1.local.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/patches/rpm-4.14.1.local.patch b/patches/rpm-4.14.1.local.patch
index 94b74f2d..904ee921 100644
--- a/patches/rpm-4.14.1.local.patch
+++ b/patches/rpm-4.14.1.local.patch
@@ -92,37 +92,6 @@ diff -ru rpm-4.14.1.orig/configure rpm-4.14.1/configure
if test -z "${NDB_TRUE}" && test -z "${NDB_FALSE}"; then
as_fn_error $? "conditional \"NDB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff -ru rpm-4.14.1.orig/configure.ac rpm-4.14.1/configure.ac
---- rpm-4.14.1.orig/configure.ac 2018-01-16 10:30:14.074141024 +0100
-+++ rpm-4.14.1/configure.ac 2018-04-01 01:52:13.858545262 +0200
-@@ -509,6 +509,18 @@
- AM_CONDITIONAL(HAVE_LIBDW_STRTAB,[test "$HAVE_LIBDW_STRTAB" = yes])
-
- #=================
-+# Enable Berkeley DB rpmdb backend
-+AC_ARG_ENABLE([bdb],
-+ [AS_HELP_STRING([--enable-bdb=@<:@yes/no@:>@],
-+ [build with Berkeley DB rpm database format support (default=yes)])],
-+ [enable_bdb="$enableval"],
-+ [enable_bdb=yes])
-+
-+AS_IF([test "$enable_bdb" = "yes"], [
-+
-+ AC_DEFINE([ENABLE_BDB], [], [Enable Berkeley DB rpmdb support])
-+
-+#=================
- # Process --with/without-external-db
- AC_ARG_WITH(external_db, [AS_HELP_STRING([--with-external-db],[build against an external Berkeley db])],
- [case "$with_external_db" in
-@@ -566,6 +578,8 @@
- esac
-
- AC_SUBST([WITH_DB_LIB])
-+])
-+AM_CONDITIONAL([BDB], [test "$enable_bdb" = yes])
-
- #=================
- # Process --enable-ndb
diff -ru rpm-4.14.1.orig/lib/backend/dbi.c rpm-4.14.1/lib/backend/dbi.c
--- rpm-4.14.1.orig/lib/backend/dbi.c 2017-10-05 12:04:56.946602155 +0200
+++ rpm-4.14.1/lib/backend/dbi.c 2018-04-01 01:52:13.858545262 +0200
@@ -155,34 +124,6 @@ diff -ru rpm-4.14.1.orig/lib/backend/dbi.c rpm-4.14.1/lib/backend/dbi.c
if (db_backend)
free(db_backend);
-diff -ru rpm-4.14.1.orig/lib/Makefile.am rpm-4.14.1/lib/Makefile.am
---- rpm-4.14.1.orig/lib/Makefile.am 2017-10-05 12:04:56.944602155 +0200
-+++ rpm-4.14.1/lib/Makefile.am 2018-04-01 01:52:13.858545262 +0200
-@@ -24,7 +24,7 @@
-
- usrlib_LTLIBRARIES = librpm.la
- librpm_la_SOURCES = \
-- backend/db3.c backend/dbi.c backend/dbi.h \
-+ backend/dbi.c backend/dbi.h \
- backend/dbiset.c backend/dbiset.h \
- headerutil.c header.c headerfmt.c header_internal.h \
- rpmdb.c rpmdb_internal.h \
-@@ -59,11 +59,15 @@
- librpm_la_SOURCES += rpmliblua.c rpmliblua.h
- endif
-
-+if BDB
-+librpm_la_SOURCES += \
-+ backend/db3.c
- if WITH_INTERNAL_DB
- librpm_la_LIBADD += $(libdb_la)
- else
- librpm_la_LIBADD += @WITH_DB_LIB@
- endif
-+endif
-
- if NDB
- librpm_la_SOURCES += \
diff -ru rpm-4.14.1.orig/lib/Makefile.in rpm-4.14.1/lib/Makefile.in
--- rpm-4.14.1.orig/lib/Makefile.in 2018-04-01 01:53:02.858212489 +0200
+++ rpm-4.14.1/lib/Makefile.in 2018-04-01 01:52:38.898375168 +0200