]> TLD Linux GIT Repositories - packages/poldek.git/blob - poldek-libdb.patch
- workaround conflicting types with glibc 2.25 by removing use of local_stdint.h
[packages/poldek.git] / poldek-libdb.patch
1 diff -ur poldek-0.30.1.orig/configure.ac poldek-0.30.1/configure.ac
2 --- poldek-0.30.1.orig/configure.ac     2014-03-26 19:23:01.000000000 +0000
3 +++ poldek-0.30.1/configure.ac  2015-07-12 20:28:29.254107458 +0000
4 @@ -299,35 +299,13 @@
5  AC_CHECK_FUNCS(gzungetc)
6  
7  DBLIB=""
8 -if test "${is_rpm4_0_4}." = "no." ; then
9 -       dnl tocheck: -ldb-3.1 causes link with static lib from /usr/lib
10 -       dnl instead shared one from /lib
11 -       #AC_CHECK_LIB(db-3.1, db_create, [DBLIB="-ldb-3.1"],
12 -       #  AC_CHECK_LIB(db-3.0, db_create, [DBLIB="-ldb-3.0"],
13 -       #    AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"])
14 -       #  )
15 -       #)
16 -       CPPFLAGS="-I/usr/include/db3 $CPPFLAGS"
17 -       
18 -       AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"],,[$LIBS])
19 -       # assume that librpm complied with --enable-db1
20 -       #if test "${ENABLE_STATIC}." = "yes."; then 
21 -       #       DBLIB="$DBLIB -ldb1"
22 -       #fi
23 -else
24 -    AC_CHECK_LIB(db4, db_create, [DBLIB="-ldb4" DBINCLUDE="-I/usr/include/db4"],
25 -        [AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1" DBINCLUDE="-I/usr/include/db4.1"],
26 -             [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0" DBINCLUDE="-I/usr/include/db4.0"],
27 -                     [AC_CHECK_LIB(db-5.2, db_create, [DBLIB="-ldb-5.2" DBINCLUDE="-I/usr/include/db5.2"],,[$LIBS])],
28 -                     [$LIBS])],, [$LIBS])],, [$LIBS])
29 +AC_CHECK_LIB(db-4.5, db_create, [DBLIB="-ldb-4.5" DBINCLUDE="-I/usr/include/db4.5"],,[$LIBS])
30  
31 -       if test "${ENABLE_STATIC}." = "yes."; then 
32 -               DBLIB="$DBLIB"
33 -       fi
34 -
35 -       CPPFLAGS="$DBINCLUDE $CPPFLAGS"
36 +if test "${ENABLE_STATIC}." = "yes."; then 
37 +       DBLIB="$DBLIB"
38  fi
39  
40 +CPPFLAGS="$DBINCLUDE $CPPFLAGS"
41  
42  AC_CHECK_LIB(popt, poptReadConfigFile)
43