From: Marcin Krol Date: Sun, 12 Jul 2015 20:43:35 +0000 (+0000) Subject: - force compilation with db 4.5 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=7ad200a5941a433e3e1a21f866e904d24dc01818;p=packages%2Fpoldek.git - force compilation with db 4.5 --- diff --git a/poldek-libdb.patch b/poldek-libdb.patch new file mode 100644 index 0000000..e739f50 --- /dev/null +++ b/poldek-libdb.patch @@ -0,0 +1,43 @@ +diff -ur poldek-0.30.1.orig/configure.ac poldek-0.30.1/configure.ac +--- poldek-0.30.1.orig/configure.ac 2014-03-26 19:23:01.000000000 +0000 ++++ poldek-0.30.1/configure.ac 2015-07-12 20:28:29.254107458 +0000 +@@ -299,35 +299,13 @@ + AC_CHECK_FUNCS(gzungetc) + + DBLIB="" +-if test "${is_rpm4_0_4}." = "no." ; then +- dnl tocheck: -ldb-3.1 causes link with static lib from /usr/lib +- dnl instead shared one from /lib +- #AC_CHECK_LIB(db-3.1, db_create, [DBLIB="-ldb-3.1"], +- # AC_CHECK_LIB(db-3.0, db_create, [DBLIB="-ldb-3.0"], +- # AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"]) +- # ) +- #) +- CPPFLAGS="-I/usr/include/db3 $CPPFLAGS" +- +- AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"],,[$LIBS]) +- # assume that librpm complied with --enable-db1 +- #if test "${ENABLE_STATIC}." = "yes."; then +- # DBLIB="$DBLIB -ldb1" +- #fi +-else +- AC_CHECK_LIB(db4, db_create, [DBLIB="-ldb4" DBINCLUDE="-I/usr/include/db4"], +- [AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1" DBINCLUDE="-I/usr/include/db4.1"], +- [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0" DBINCLUDE="-I/usr/include/db4.0"], +- [AC_CHECK_LIB(db-5.2, db_create, [DBLIB="-ldb-5.2" DBINCLUDE="-I/usr/include/db5.2"],,[$LIBS])], +- [$LIBS])],, [$LIBS])],, [$LIBS]) ++AC_CHECK_LIB(db-4.5, db_create, [DBLIB="-ldb-4.5" DBINCLUDE="-I/usr/include/db4.5"],,[$LIBS]) + +- if test "${ENABLE_STATIC}." = "yes."; then +- DBLIB="$DBLIB" +- fi +- +- CPPFLAGS="$DBINCLUDE $CPPFLAGS" ++if test "${ENABLE_STATIC}." = "yes."; then ++ DBLIB="$DBLIB" + fi + ++CPPFLAGS="$DBINCLUDE $CPPFLAGS" + + AC_CHECK_LIB(popt, poptReadConfigFile) + diff --git a/poldek.spec b/poldek.spec index 8dea159..d73fbdb 100644 --- a/poldek.spec +++ b/poldek.spec @@ -29,6 +29,7 @@ Source6: %{name}.desktop Source7: %{name}.png Patch0: %{name}-size-type.patch Patch1: %{name}-config.patch +Patch2: %{name}-libdb.patch URL: http://poldek.pld-linux.org/ BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel} BuildRequires: autoconf @@ -192,6 +193,7 @@ Moduły języka Python dla poldka. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %{__rm} m4/libtool.m4 m4/lt*.m4