fix patch name, fix second incorrect MkLinux check

This commit is contained in:
Karsten Hopp 2013-06-04 15:41:43 +02:00
parent 2aa6adb4e0
commit 001b671370
3 changed files with 25 additions and 13 deletions

View File

@ -1,12 +0,0 @@
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

View File

@ -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

View File

@ -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