Package: narval
Version: 1.10.2-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmpqBVjpe
In Ubuntu, the attached patch was applied to fix a FTBFS with multiarch support.
With the current configure.ac, it can't find libuuid.a installing in multiarch
location.
This patch remove the check, because the package build correctly without it,
and all binaries seems to be correctly linked.
Changelog :
* debian/patches:
- remove_check_file_uuid.patch: Remove the check for the .a files, it's not
needed to build, and all binaries are correctly linked without it.
LP: #756207
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru narval-1.10.2/debian/patches/remove_check_file_uuid.patch narval-1.10.2/debian/patches/remove_check_file_uuid.patch
--- narval-1.10.2/debian/patches/remove_check_file_uuid.patch 1970-01-01 01:00:00.000000000 +0100
+++ narval-1.10.2/debian/patches/remove_check_file_uuid.patch 2011-09-13 00:51:24.000000000 +0200
@@ -0,0 +1,24 @@
+Index: narval-1.10.2/configure.ac
+===================================================================
+--- narval-1.10.2.orig/configure.ac 2011-09-13 00:11:36.000000000 +0200
++++ narval-1.10.2/configure.ac 2011-09-13 00:51:14.000000000 +0200
+@@ -172,8 +172,6 @@
+ AC_MSG_RESULT($__DISTRIB_VERSION__)
+
+ case $__DISTRIB__ in
+- debian)AC_CHECK_FILE(/usr/lib/libuuid.a,,__FILE_FOUND__="no")
+- ;;
+ fedora)AC_CHECK_FILE(/usr/lib/libssl.a,,__FILE_FOUND__="no")
+ AC_CHECK_FILE(/usr/lib/libcrypto.a,,__FILE_FOUND__="no")
+ AC_CHECK_FILE(/usr/lib/libuuid.a,,__FILE_FOUND__="no")
+@@ -222,10 +220,6 @@
+ AC_CHECK_FILE(/usr/lib64/libcom_err.a,,__FILE_FOUND__="no")
+ AC_CHECK_FILE(/usr/lib64/libresolv.a,,__FILE_FOUND__="no")
+ SSLLIB="/usr/lib64/libssl.a /usr/lib64/libcrypto.a /usr/lib64/libkrb5.a /usr/lib64/libk5crypto.a /usr/lib64/libcom_err.a /usr/lib64/libresolv.a -ldl";;
+- *)AC_CHECK_FILE(/usr/lib/libssl.a,,__FILE_FOUND__="no")
+- AC_CHECK_FILE(/usr/lib/libcrypto.a,,__FILE_FOUND__="no")
+- AC_CHECK_FILE(/usr/lib/libuuid.a,,__FILE_FOUND__="no")
+- SSLLIB="/usr/lib/libssl.a /usr/lib/libcrypto.a -ldl";;
+ esac
+ if test "$__FILE_FOUND__" = "no"; then
+ case $__DISTRIB__ in
diff -Nru narval-1.10.2/debian/patches/series narval-1.10.2/debian/patches/series
--- narval-1.10.2/debian/patches/series 2010-05-16 01:01:52.000000000 +0200
+++ narval-1.10.2/debian/patches/series 2011-09-13 00:50:52.000000000 +0200
@@ -1 +1,2 @@
fix-bug581330.patch
+remove_check_file_uuid.patch
