- x32 rebuild

[packages/djvulibre.git] / djvulibre-opt.patch

diff --git a/djvulibre-opt.patch b/djvulibre-opt.patch
index 75504481cc3fb7f12ed79beb00bd94b1503fd7e2..3e248185d3bd10073afa4b16767e4e83112d34e7 100644 (file)
--- a/djvulibre-opt.patch
+++ b/djvulibre-opt.patch
@@ -1,6 +1,7 @@
---- djvulibre-3.5.11/config/acinclude.m4.orig  2003-03-22 22:18:00.000000000 +0100
-+++ djvulibre-3.5.11/config/acinclude.m4       2003-05-13 19:15:32.000000000 +0200
-@@ -79,41 +79,6 @@
+diff -aurN djvulibre-3.5.17.orig/config/acinclude.m4 djvulibre-3.5.17/config/acinclude.m4
+--- djvulibre-3.5.17.orig/config/acinclude.m4  2006-02-22 00:16:17.000000000 +0100
++++ djvulibre-3.5.17/config/acinclude.m4       2006-05-16 19:04:01.600526896 +0200
+@@ -79,46 +79,6 @@
          [ac_debug=$enableval],[ac_debug=no])
     OPTS=
     AC_SUBST(OPTS)
@@ -22,23 +23,28 @@
 -     esac
 -   done
 -   if test x$ac_debug = xno ; then
--     OPTS=-DNO_DEBUG
+-     OPTS=-DNDEBUG
 -     AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"])
 -     AC_CHECK_CXX_OPT([-O3],[OPTS="$OPTS -O3"],
 -        [ AC_CHECK_CXX_OPT([-O2], [OPTS="$OPTS -O2"] ) ] )
--     dnl This triggers compiler bugs with gcc-3.2.2
+-     dnl This triggers compiler bugs with gcc-3.2.2:
 -     dnl AC_CHECK_CXX_OPT([-funroll-loops], [OPTS="$OPTS -funroll-loops"])
+-     dnl QT3 has plenty of this:
+-     AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor],[OPTS="$OPTS -Wno-non-virtual-dtor"])
 -     cpu=`uname -m 2>/dev/null`
 -     test -z "$cpu" && cpu=${host_cpu}
 -     case "${host_cpu}" in
 -        i?86)
--           opt="-mcpu=${host_cpu}"
--           AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"])
+-           opt="-mtune=${host_cpu}"
+-           AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"],
+-             [ opt="-mcpu=${host_cpu}"
+-               AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"]) ])
 -           ;;
 -      esac
 -   else
 -     AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"])
+-     AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor],[OPTS="$OPTS -Wno-non-virtual-dtor"])
 -   fi
     case x"$ac_debug" in
+ changequote(<<, >>)dnl
       x[0-9])  OPTS="$OPTS -DDEBUGLVL=$ac_debug" ;;
-      xr*)   OPTS="$OPTS -DRUNTIME_DEBUG_ONLY" ;;