rpms/mkvtoolnix/devel mkvtoolnix-ppc64-debug.patch,1.3,1.4

[Dominik Mierzejewski]

Author: rathann

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

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mkvtoolnix-ppc64-debug.patch	1 Dec 2008 19:26:17 -0000	1.3
+++ mkvtoolnix-ppc64-debug.patch	1 Dec 2008 19:41:44 -0000	1.4
@@ -1,7 +1,7 @@
 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
++++ mkvtoolnix-2.4.0/ac/ax_boost_base.m4	2008-12-01 20:40:44.000000000 +0100
+@@ -84,20 +84,18 @@ 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
@@ -10,7 +10,10 @@
 -        else
 -            BOOST_LDFLAGS="-L$ac_boost_path/lib"
 -        fi
-+        BOOST_LDFLAGS="-L$ac_boost_path/lib64 -L$ac_boost_path/lib"
++        case $target in
++             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
++             *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
++        esac
          BOOST_CPPFLAGS="-I$ac_boost_path/include"
      else
          for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
@@ -20,11 +23,14 @@
 -                else
 -                    BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
 -                fi
-+                BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64 -L$ac_boost_path_tmp/lib"
++                case $target in
++                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
++                     *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
++                esac
                  BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
                  break;
              fi
-@@ -171,11 +163,7 @@ if test "x$want_boost" = "xyes"; then
+@@ -171,11 +169,10 @@ if test "x$want_boost" = "xyes"; then
              BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
              if test "$ac_boost_lib_path" = ""
              then
@@ -33,13 +39,16 @@
 -                else
 -                    BOOST_LDFLAGS="-L$best_path/lib"
 -                fi
-+                BOOST_LDFLAGS="-L$best_path/lib64 -L$best_path/lib"
++                case $target in
++                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
++                     *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
++                esac
              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 20:15:45.000000000 +0100
++++ mkvtoolnix-2.4.0/configure	2008-12-01 20:38:53.000000000 +0100
 @@ -9931,6 +9931,7 @@ else
  
  fi
@@ -48,7 +57,7 @@
  
  if test "x$want_boost" = "xyes"; then
      boost_lib_version_req=1.29.0
-@@ -9947,20 +9948,12 @@ echo $ECHO_N "checking for boostlib >= $
+@@ -9947,20 +9948,18 @@ echo $ECHO_N "checking for boostlib >= $
      succeeded=no
  
                  if test "$ac_boost_path" != ""; then
@@ -57,7 +66,10 @@
 -        else
 -            BOOST_LDFLAGS="-L$ac_boost_path/lib"
 -        fi
-+                   BOOST_LDFLAGS="-L$ac_boost_path/lib64 -L$ac_boost_path/lib"
++                   case $target in
++                        ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
++                        *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
++                   esac
          BOOST_CPPFLAGS="-I$ac_boost_path/include"
      else
          for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
@@ -67,11 +79,14 @@
 -                else
 -                    BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
 -                fi
-+                BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64 -L$ac_boost_path_tmp/lib"
++                case $target in
++                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
++                     *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
++                esac
                  BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
                  break;
              fi
-@@ -10081,11 +10074,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -10081,11 +10080,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
              BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
              if test "$ac_boost_lib_path" = ""
              then
@@ -80,7 +95,10 @@
 -                else
 -                    BOOST_LDFLAGS="-L$best_path/lib"
 -                fi
-+                BOOST_LDFLAGS="-L$best_path/lib64 -L$best_path/lib"
++                case $target in
++                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
++                     *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
++                esac
              fi
  
                  if test "x$BOOST_ROOT" != "x"; then