Package: arpon
Version: 2.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpJHBkSH
Dear maintainer,
in Ubuntu, which has multiarch enabled, arpon fails to build because it looks
for
files at the wrong places. The attached patch fixes the issue.
The patch has been forwarded upstream per email.
* cmake_modules/FindPthread.cmake: fix pthread library search to account for
multiarch.
Thanks for considering the patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty
APT policy: (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-7-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru arpon-2.0/debian/patches/fix_multiarch.patch arpon-2.0/debian/patches/fix_multiarch.patch
--- arpon-2.0/debian/patches/fix_multiarch.patch 1970-01-01 01:00:00.000000000 +0100
+++ arpon-2.0/debian/patches/fix_multiarch.patch 2011-04-02 03:11:35.000000000 +0200
@@ -0,0 +1,27 @@
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Origin: Ubuntu, https://bugs.launchpad.net/ubuntu/+source/arpon/+bug/747889/+attachment/1966748/+files/arpon-747889.diff
+Bug-Debian:
+Bug-Ubuntu: https://launchpad.net/bugs/747889
+Forwarded: to author email
+Last-Update: <2011-04-02>
+
+--- arpon-2.0.orig/cmake_modules/FindPthread.cmake
++++ arpon-2.0/cmake_modules/FindPthread.cmake
+@@ -16,7 +16,7 @@ find_path(PTHREAD_LIB_DIR ${libpthread}
+
+ find_library(PTHREAD_LIBRARY NAMES ${libpthread} PATH ${CMAKE_LIBRARY_PATH})
+
+-if(PTHREAD_INCLUDE_DIR AND PTHREAD_LIB_DIR AND PTHREAD_LIBRARY )
++if(PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY )
+ message(STATUS "Found Libphtread.")
+
+ if(NOT ${INCLUDE_DIR} MATCHES ${PTHREAD_INCLUDE_DIR})
+@@ -24,7 +24,7 @@ if(PTHREAD_INCLUDE_DIR AND PTHREAD_LIB_D
+ set(INCLUDE_DIR "${INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}")
+ endif(NOT ${INCLUDE_DIR} MATCHES ${PTHREAD_INCLUDE_DIR})
+
+- if(NOT ${LIB_DIR} MATCHES ${PTHREAD_LIB_DIR})
++ if(PTHREAD_LIB_DIR AND NOT ${LIB_DIR} MATCHES ${PTHREAD_LIB_DIR})
+ link_directories(${PTHREAD_LIB_DIR})
+ set(LIB_DIR "${LIB_DIR} ${PTHREAD_LIB_DIR}")
+ endif(NOT ${LIB_DIR} MATCHES ${PTHREAD_LIB_DIR})
diff -Nru arpon-2.0/debian/patches/series arpon-2.0/debian/patches/series
--- arpon-2.0/debian/patches/series 2010-08-19 19:19:10.000000000 +0200
+++ arpon-2.0/debian/patches/series 2011-04-02 03:08:36.000000000 +0200
@@ -1,2 +1,3 @@
install.patch
arpon.sarpi.patch
+fix_multiarch.patch
