rpms/mkvtoolnix/devel mkvtoolnix-ppc64-debug.patch,1.1,1.2

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14242

Modified Files:
	mkvtoolnix-ppc64-debug.patch 
Log Message:
ppc64 debug, next try

mkvtoolnix-ppc64-debug.patch:

Index: mkvtoolnix-ppc64-debug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix-ppc64-debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mkvtoolnix-ppc64-debug.patch	1 Dec 2008 18:39:52 -0000	1.1
+++ mkvtoolnix-ppc64-debug.patch	1 Dec 2008 19:18:29 -0000	1.2
@@ -1,11 +1,86 @@
+diff -up mkvtoolnix-2.4.0/ac/ax_boost_base.m4.ppc64 mkvtoolnix-2.4.0/ac/ax_boost_base.m4
+--- mkvtoolnix-2.4.0/ac/ax_boost_base.m4.ppc64	2008-09-25 15:21:31.000000000 +0200
++++ mkvtoolnix-2.4.0/ac/ax_boost_base.m4	2008-12-01 20:17:17.000000000 +0100
+@@ -84,20 +84,12 @@ if test "x$want_boost" = "xyes"; then
+     dnl this location ist chosen if boost libraries are installed with the --layout=system option
+     dnl or if you install boost with RPM
+     if test "$ac_boost_path" != ""; then
+-        if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path/lib64" ; then
+-            BOOST_LDFLAGS="-L$ac_boost_path/lib64"
+-        else
+-            BOOST_LDFLAGS="-L$ac_boost_path/lib"
+-        fi
++        BOOST_LDFLAGS="-L$ac_boost_path/lib64 -L$ac_boost_path/lib"
+         BOOST_CPPFLAGS="-I$ac_boost_path/include"
+     else
+         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+-                if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path_tmp/lib64" ; then
+-                    BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64"
+-                else
+-                    BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+-                fi
++                BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64 -L$ac_boost_path_tmp/lib"
+                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+                 break;
+             fi
+@@ -171,11 +163,7 @@ if test "x$want_boost" = "xyes"; then
+             BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+             if test "$ac_boost_lib_path" = ""
+             then
+-                if test "`uname -m`" = "x86_64" && test -d "$best_path/lib64" ; then
+-                    BOOST_LDFLAGS="-L$best_path/lib64"
+-                else
+-                    BOOST_LDFLAGS="-L$best_path/lib"
+-                fi
++                BOOST_LDFLAGS="-L$best_path/lib64 -L$best_path/lib"
+             fi
+ 
+                 if test "x$BOOST_ROOT" != "x"; then
 diff -up mkvtoolnix-2.4.0/configure.ppc64 mkvtoolnix-2.4.0/configure
 --- mkvtoolnix-2.4.0/configure.ppc64	2008-11-30 22:06:00.000000000 +0100
-+++ mkvtoolnix-2.4.0/configure	2008-12-01 19:37:48.000000000 +0100
-@@ -10295,6 +10295,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
++++ mkvtoolnix-2.4.0/configure	2008-12-01 20:15:45.000000000 +0100
+@@ -9931,6 +9931,7 @@ else
  
  fi
- { echo "$as_me:$LINENO: result: $ax_cv_boost_regex" >&5
+ 
 +set -x
- echo "${ECHO_T}$ax_cv_boost_regex" >&6; }
-         if test "x$ax_cv_boost_regex" = "xyes"; then
  
+ if test "x$want_boost" = "xyes"; then
+     boost_lib_version_req=1.29.0
+@@ -9947,20 +9948,12 @@ echo $ECHO_N "checking for boostlib >= $
+     succeeded=no
+ 
+                 if test "$ac_boost_path" != ""; then
+-        if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path/lib64" ; then
+-            BOOST_LDFLAGS="-L$ac_boost_path/lib64"
+-        else
+-            BOOST_LDFLAGS="-L$ac_boost_path/lib"
+-        fi
++                   BOOST_LDFLAGS="-L$ac_boost_path/lib64 -L$ac_boost_path/lib"
+         BOOST_CPPFLAGS="-I$ac_boost_path/include"
+     else
+         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+-                if test "`uname -m`" = "x86_64" && test -d "$ac_boost_path_tmp/lib64" ; then
+-                    BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64"
+-                else
+-                    BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+-                fi
++                BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64 "-L$ac_boost_path_tmp/lib"
+                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+                 break;
+             fi
+@@ -10081,11 +10074,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+             BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+             if test "$ac_boost_lib_path" = ""
+             then
+-                if test "`uname -m`" = "x86_64" && test -d "$best_path/lib64" ; then
+-                    BOOST_LDFLAGS="-L$best_path/lib64"
+-                else
+-                    BOOST_LDFLAGS="-L$best_path/lib"
+-                fi
++                BOOST_LDFLAGS="-L$best_path/lib64 -L$best_path/lib"
+             fi
+ 
+                 if test "x$BOOST_ROOT" != "x"; then