From: Jacek Konieczny <j.konieczny@eggsoft.pl>
Date: Tue, 5 Mar 2019 09:57:04 +0000 (+0100)
Subject: x32.patch updated
X-Git-Tag: auto/th/bacula-9.4.2-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbacula.git;a=commitdiff_plain;h=8b0a640

x32.patch updated
---

diff --git a/x32.patch b/x32.patch
index 0df7867..df1cede 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,5 +1,6 @@
---- bacula-7.4.4/autoconf/bacula-macros/db.m4~	2016-09-29 15:59:30.000000000 +0200
-+++ bacula-7.4.4/autoconf/bacula-macros/db.m4	2017-02-28 20:10:56.208362445 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' bacula-9.4.2.orig/autoconf/bacula-macros/db.m4 bacula-9.4.2/autoconf/bacula-macros/db.m4
+--- bacula-9.4.2.orig/autoconf/bacula-macros/db.m4	2019-02-04 17:47:31.000000000 +0100
++++ bacula-9.4.2/autoconf/bacula-macros/db.m4	2019-03-05 10:55:30.000000000 +0100
 @@ -12,24 +12,24 @@
       if test "$withval" = "yes"; then
          if test -f /usr/local/include/dbi/dbi.h; then
@@ -395,7 +396,7 @@
                          else
                                  MYSQL_LIBDIR=$withval/lib
                          fi
-@@ -755,24 +755,24 @@
+@@ -755,8 +755,8 @@
       if test "$withval" = "yes"; then
          if test -f /usr/local/include/sqlite3.h; then
             SQLITE_INCDIR=/usr/local/include
@@ -406,12 +407,13 @@
             else
                SQLITE_LIBDIR=/usr/local/lib
             fi
-            SQLITE_BINDIR=/usr/local/bin
-         elif test -f /usr/include/sqlite3.h; then
+@@ -765,16 +765,16 @@
             SQLITE_INCDIR=/usr/include
--           if test -d /usr/lib64; then
+            if test -n $multiarch -a -d /usr/lib/$multiarch; then
+               SQLITE_LIBDIR=/usr/lib/$multiarch
+-           elif test -d /usr/lib64; then
 -              SQLITE_LIBDIR=/usr/lib64
-+           if test -d /usr/libx32; then
++           elif test -d /usr/libx32; then
 +              SQLITE_LIBDIR=/usr/libx32
             else
                SQLITE_LIBDIR=/usr/lib
@@ -426,7 +428,7 @@
             else
                SQLITE_LIBDIR=$prefix/lib
             fi
-@@ -788,8 +788,8 @@
+@@ -790,8 +790,8 @@
             SQLITE_BINDIR=$withval
          elif test -f $withval/include/sqlite3.h; then
             SQLITE_INCDIR=$withval/include
@@ -437,7 +439,7 @@
             else
                SQLITE_LIBDIR=$withval/lib
             fi
-@@ -870,32 +870,32 @@
+@@ -872,32 +872,32 @@
                POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir`
            elif test -f /usr/local/include/libpq-fe.h; then
                POSTGRESQL_INCDIR=/usr/local/include
@@ -478,7 +480,7 @@
                else
                   POSTGRESQL_LIBDIR=/usr/lib/postgresql
                fi
-@@ -910,8 +910,8 @@
+@@ -912,8 +912,8 @@
            POSTGRESQL_BINDIR=$withval/bin
        elif test -f $withval/include/postgresql/libpq-fe.h; then
            POSTGRESQL_INCDIR=$withval/include/postgresql
@@ -489,9 +491,10 @@
            else
                POSTGRESQL_LIBDIR=$withval/lib
            fi
---- bacula-7.4.4/autoconf/configure.in~	2017-02-28 20:07:04.000000000 +0100
-+++ bacula-7.4.4/autoconf/configure.in	2017-02-28 20:11:43.892643223 +0100
-@@ -277,7 +277,7 @@
+diff -durN -x '*~' -x '*.orig' -x '*.rej' bacula-9.4.2.orig/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
+--- bacula-9.4.2.orig/autoconf/configure.in	2019-03-05 10:53:03.000000000 +0100
++++ bacula-9.4.2/autoconf/configure.in	2019-03-05 10:54:27.000000000 +0100
+@@ -299,7 +299,7 @@
  	 os_processor=`uname -p 2>/dev/null`
  	 case ${os_processor} in
  	 x86_64)
@@ -500,7 +503,7 @@
  	    ;;
  	 *)
  	    libdir=/usr/lib
-@@ -2419,9 +2419,9 @@
+@@ -2485,9 +2485,9 @@
     for dir in ${with_afsdir}/lib \
  	      ${with_afsdir}/lib/afs \
  	      ${with_afsdir}/lib/openafs \
@@ -513,7 +516,7 @@
     do
        for arch_type in .a .so
        do
-@@ -2618,8 +2618,8 @@ if test x$support_acl = xyes -o x$suppor
+@@ -2628,8 +2628,8 @@
  	 dnl
  	 dnl Because of possible naming conflict with AFS libacl make sure we use the one in /usr/lib64 or /usr/lib !!!
  	 dnl
@@ -524,4 +527,3 @@
  	    else
  	       FDLIBS="-L/usr/lib -lacl $FDLIBS"
  	    fi
-