[cyrus-sasl/f19] disable incorrect check for MkLinux to allow building with shared libraries on PPC

Karsten Hopp karsten at fedoraproject.org
Tue Jun 4 13:34:52 UTC 2013


commit 2aa6adb4e0db4e21f8b359b062e3374f6711f570
Author: Karsten Hopp <karsten at redhat.com>
Date:   Tue Jun 4 15:34:31 2013 +0200

    disable incorrect check for MkLinux to allow building with shared libraries on PPC

 cyrus-sasl-2.1.2-ppc.patch |   12 ++++++++++++
 cyrus-sasl.spec            |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/cyrus-sasl-2.1.2-ppc.patch b/cyrus-sasl-2.1.2-ppc.patch
new file mode 100644
index 0000000..3b7ad31
--- /dev/null
+++ b/cyrus-sasl-2.1.2-ppc.patch
@@ -0,0 +1,12 @@
+diff -up cyrus-sasl-2.1.26/config/ltconfig.kh cyrus-sasl-2.1.26/config/ltconfig
+--- cyrus-sasl-2.1.26/config/ltconfig.kh	2013-06-04 15:22:03.805307536 +0200
++++ cyrus-sasl-2.1.26/config/ltconfig	2013-06-04 15:22:44.385433261 +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 9bdc6a6..619e1ed 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.26
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -42,6 +42,8 @@ Patch44: cyrus-sasl-2.1.26-release-server_creds.patch
 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
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -179,6 +181,7 @@ chmod -x include/*.h
 %patch44 -p1 -b .release-server_creds
 %patch45 -p1 -b .obsolete-macro
 %patch46 -p1 -b .size_t
+%patch47 -p1 -b .ppc
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -407,6 +410,9 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Tue Jun 04 2013 Karsten Hopp <karsten at redhat.com> 2.1.26-8
+- disable incorrect check for MkLinux to allow building with shared libraries on PPC
+
 * Tue May 21 2013 Petr Lautrbach <plautrba at redhat.com> 2.1.26-7
 - fix the spec file in order to build the cyrus-sasl-sql plugin
   with support for PostgreSQL and MySQL


More information about the scm-commits mailing list