[cyrus-sasl/f19] fix patch name, fix second incorrect MkLinux check

Karsten Hopp karsten at fedoraproject.org
Tue Jun 4 13:43:24 UTC 2013


commit 001b671370e43a15a70224be1a523fbf63736d80
Author: Karsten Hopp <karsten at redhat.com>
Date:   Tue Jun 4 15:41:43 2013 +0200

    fix patch name, fix second incorrect MkLinux check

 cyrus-sasl-2.1.2-ppc.patch  |   12 ------------
 cyrus-sasl-2.1.26-ppc.patch |   24 ++++++++++++++++++++++++
 cyrus-sasl.spec             |    2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)
---
diff --git a/cyrus-sasl-2.1.26-ppc.patch b/cyrus-sasl-2.1.26-ppc.patch
new file mode 100644
index 0000000..0ebba70
--- /dev/null
+++ b/cyrus-sasl-2.1.26-ppc.patch
@@ -0,0 +1,24 @@
+diff -up cyrus-sasl-2.1.26/config/ltconfig.ppc cyrus-sasl-2.1.26/config/ltconfig
+--- cyrus-sasl-2.1.26/config/ltconfig.ppc	2012-10-12 16:05:48.000000000 +0200
++++ cyrus-sasl-2.1.26/config/ltconfig	2013-06-04 15:38:53.695401296 +0200
+@@ -2040,7 +2040,7 @@ linux-gnu*)
+   else
+     # Only the GNU ld.so supports shared libraries on MkLinux.
+     case "$host_cpu" in
+-    powerpc*) dynamic_linker=no ;;
++#    powerpc*) dynamic_linker=no ;;
+     *) dynamic_linker='Linux ld.so' ;;
+     esac
+   fi
+diff -up cyrus-sasl-2.1.26/saslauthd/config/ltconfig.ppc cyrus-sasl-2.1.26/saslauthd/config/ltconfig
+--- cyrus-sasl-2.1.26/saslauthd/config/ltconfig.ppc	2013-06-04 15:39:49.849463707 +0200
++++ cyrus-sasl-2.1.26/saslauthd/config/ltconfig	2013-06-04 15:39:12.826741036 +0200
+@@ -2040,7 +2040,7 @@ linux-gnu*)
+   else
+     # Only the GNU ld.so supports shared libraries on MkLinux.
+     case "$host_cpu" in
+-    powerpc*) dynamic_linker=no ;;
++    #powerpc*) dynamic_linker=no ;;
+     *) dynamic_linker='Linux ld.so' ;;
+     esac
+   fi
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 619e1ed..c091395 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -43,7 +43,7 @@ Patch45: cyrus-sasl-2.1.26-obsolete-macro.patch
 # missing size_t declaration in sasl.h
 Patch46: cyrus-sasl-2.1.26-size_t.patch
 # disable incorrect check for MkLinux
-Patch47: cyrus-sasl-2.1.2-ppc.patch
+Patch47: cyrus-sasl-2.1.26-ppc.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff


More information about the scm-commits mailing list