Package: gnash
Version: 0.8.9-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmptz8Ams
In Ubuntu, the attached patch was applied to achieve the following:
Don't dynamically check for libpthread since we're a GNU platform
libpthread should be available on GNU platforms, so we don't need a dynamic
check for it; the check breaks with multiarch paths
Thanks for considering the patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500,
'natty-proposed'), (500, 'natty-backports'), (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-7-generic (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gnash-0.8.9/debian/patches/no_configure_check_for_libpthread.patch gnash-0.8.9/debian/patches/no_configure_check_for_libpthread.patch
--- gnash-0.8.9/debian/patches/no_configure_check_for_libpthread.patch 1969-12-31 18:00:00.000000000 -0600
+++ gnash-0.8.9/debian/patches/no_configure_check_for_libpthread.patch 2011-04-03 21:01:14.000000000 -0500
@@ -0,0 +1,49 @@
+Description: Don't dynamically check for libpthread since we're a GNU platform
+ libpthread should be available on GNU platforms, so we don't need a dynamic
+ check for it; the check breaks with multiarch paths
+Author: Micah Gersten <mic...@ubuntu.com>
+
+---
+Origin: ubuntu
+Last-Update: 2011-04-03
+
+--- gnash-0.8.9.orig/macros/pthreads.m4
++++ gnash-0.8.9/macros/pthreads.m4
+@@ -181,34 +181,8 @@ for flag in $pthread_flags; do\
+ fi
+ done
+
+-dnl Try a manual search, useful for cross-compiling
+-if test "x${pthreads}" = xyes; then
+- AC_MSG_CHECKING([searching for pthread library])
+- for i in $libslist; do
+- if test -f $i/libpthread.a -o -f $i/libpthread.${shlibext} -o -f $i/libpthread.dylib; then
+- pthreads=yes
+- if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
+- PTHREAD_LIBS="-L$i -lpthread"
+- AC_MSG_RESULT([using $PTHREAD_LIBS])
+- break
+- else
+- dnl If using Mingw, we have to use the pthreadGCE2 library,as it has
+- dnl has exception handling support for C++.
+- if test x"${host_os}" = x"mingw32"; then
+- PTHREAD_LIBS="-lpthreadGCE2"
+- else
+- PTHREAD_LIBS="-lpthread"
+- fi
+- AC_MSG_RESULT([using $PTHREAD_LIBS])
+- break
+- fi
+- fi
+- done
+- if test x"${PTHREAD_LIBS}" = "x"; then
+- AC_MSG_RESULT(not found)
+- pthreads=no
+- fi
+-fi
++dnl Just set PTHREAD_LIBS since we're in a GNU environment
++PTHREAD_LIBS="-lpthread"
+
+ dnl Various other checks:
+ if test "x$pthreads" = xyes; then
diff -Nru gnash-0.8.9/debian/patches/series gnash-0.8.9/debian/patches/series
--- gnash-0.8.9/debian/patches/series 2011-03-20 20:32:10.000000000 -0500
+++ gnash-0.8.9/debian/patches/series 2011-04-03 16:46:49.000000000 -0500
@@ -1 +1,2 @@
01mysqltypo
+no_configure_check_for_libpthread.patch
