Package: unixodbc-gui-qt
Version: 2.3.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch precise
unixodbc-gui-qt fails to build in the presence of multiarch Qt:
https://launchpadlibrarian.net/84969325/buildlog_ubuntu-precise-i386.unixodbc-gui-qt_2.3.0-1_FAILEDTOBUILD.txt.gz
The attached Bazaar bundle fixes this.
Thanks,
--
Colin Watson [cjwat...@ubuntu.com]
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cjwat...@canonical.com-20111118125454-fl3wuft3mtqwa2cl
# target_branch: http+urllib://anonscm.debian.org/bzr/bzr/users\
# /vorlon/unixodbc-gui-qt/trunk/
# testament_sha1: 2f2376062c085f3e82bbc56f29f7ace5234289de
# timestamp: 2011-11-18 12:55:47 +0000
# base_revision_id: vor...@debian.org-20111108190551-xjity5wdd88fhx91
#
# Begin patch
=== modified file 'configure'
--- configure 2011-08-23 21:46:32 +0000
+++ configure 2011-11-18 12:54:54 +0000
@@ -17726,12 +17726,76 @@
# No lib location given? Lets check a few known places.
#
if test "x$qt_dir_lib" = x; then
- if test -e "/usr/lib64/libQtCore.so"; then
- qt_dir_lib="/usr/lib64"
- elif test -e "/usr/lib/libQtCore.so"; then
- qt_dir_lib="/usr/lib"
- fi
- fi
+ qt_dir_lib=default
+
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+ ac_cxxflags_save="$CXXFLAGS"
+ ac_ldflags_save="$LDFLAGS"
+ ac_libs_save="$LIBS"
+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS -I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui $X_CFLAGS $all_includes"
+ if test "x$qt_dir_lib" != xdefault; then
+ LDFLAGS="$LDFLAGS -L$qt_dir_lib"
+ fi
+ LIBS="$LIBS $PTHREAD_LIBS $qt_libs"
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <QMessageBox>
+ #include <QString>
+int
+main ()
+{
+QString s = "hello world";
+ QMessageBox::information(0, s, "no he is not");
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ qt_compile=yes
+else
+ qt_compile=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+ CXXFLAGS="$ac_cxxflags_save"
+ LDFLAGS="$ac_ldflags_save"
+ LIBS="$ac_libs_save"
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test "x$qt_compile" = "xyes"; then :
+
+else
+
+ if test -e "/usr/lib64/libQtCore.so"; then
+ qt_dir_lib="/usr/lib64"
+ elif test -e "/usr/lib/libQtCore.so"; then
+ qt_dir_lib="/usr/lib"
+ else
+ qt_dir_lib=""
+ fi
+
+fi
+
+ fi
+ CXXFLAGS="$ac_cxxflags_save"
+ LIBS="$ac_libs_save"
#
# No bin location given? Lets check a few known places.
@@ -17830,15 +17894,6 @@
MOC="$qt_dir_bin"/moc
UIC="$qt_dir_bin"/uic
-
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: qt_dir_lib=$qt_dir_lib" >&5
$as_echo "$as_me: qt_dir_lib=$qt_dir_lib" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: LDFLAGS=$LDFLAGS" >&5
@@ -17849,11 +17904,21 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a simple Qt program compiles" >&5
$as_echo_n "checking whether a simple Qt program compiles... " >&6; }
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
ac_cxxflags_save="$CXXFLAGS"
ac_ldflags_save="$LDFLAGS"
ac_libs_save="$LIBS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS -I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui $X_CFLAGS $all_includes"
- LDFLAGS="$LDFLAGS -L$qt_dir_lib"
+ if test "x$qt_dir_lib" != xdefault; then
+ LDFLAGS="$LDFLAGS -L$qt_dir_lib"
+ fi
LIBS="$LIBS $PTHREAD_LIBS $qt_libs"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17890,21 +17955,27 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test "x$qt_compile" = "xyes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ if test "x$qt_compile" = "xyes"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- else
+else
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "cannot compile a Qt program!" "$LINENO" 5
- fi
+
+fi
QT_CXXFLAGS="-I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui -I$qt_dir_include/QtAssistant -I$qt_dir_include/QtNetwork"
- QT_LDFLAGS="-L$qt_dir_lib"
+ if test "x$qt_dir_lib" = xdefault; then
+ QT_LDFLAGS=""
+ else
+ QT_LDFLAGS="-L$qt_dir_lib"
+ fi
QT_LIBS="$qt_libs"
=== modified file 'debian/changelog'
--- debian/changelog 2011-11-08 19:05:51 +0000
+++ debian/changelog 2011-11-18 12:54:54 +0000
@@ -1,8 +1,14 @@
unixodbc-gui-qt (2.3.0-2) UNRELEASED; urgency=low
+ [ Steve Langasek ]
* Update debian/copyright with current information for the new source.
* Fix Vcs-* fields for new source package name
+ [ Colin Watson ]
+ * Fix build failure with multiarch Qt: test whether the Qt libraries are
+ on the default linker path, and if so don't bother trying /usr/lib64 and
+ /usr/lib.
+
-- Steve Langasek <vor...@debian.org> Wed, 24 Aug 2011 10:21:08 +0000
unixodbc-gui-qt (2.3.0-1) unstable; urgency=low
=== modified file 'qt.m4'
--- qt.m4 2011-08-23 08:23:50 +0000
+++ qt.m4 2011-11-18 12:54:54 +0000
@@ -56,12 +56,19 @@
# No lib location given? Lets check a few known places.
#
if test "x$qt_dir_lib" = x; then
- if test -e "/usr/lib64/libQtCore.so"; then
- qt_dir_lib="/usr/lib64"
- elif test -e "/usr/lib/libQtCore.so"; then
- qt_dir_lib="/usr/lib"
- fi
+ qt_dir_lib=default
+ FUN_QT_COMPILE([], [
+ if test -e "/usr/lib64/libQtCore.so"; then
+ qt_dir_lib="/usr/lib64"
+ elif test -e "/usr/lib/libQtCore.so"; then
+ qt_dir_lib="/usr/lib"
+ else
+ qt_dir_lib=""
+ fi
+ ])
fi
+ CXXFLAGS="$ac_cxxflags_save"
+ LIBS="$ac_libs_save"
#
# No bin location given? Lets check a few known places.
@@ -110,13 +117,25 @@
MOC="$qt_dir_bin"/moc
UIC="$qt_dir_bin"/uic
- FUN_QT_COMPILE
+ AC_MSG_NOTICE([qt_dir_lib=$qt_dir_lib])
+ AC_MSG_NOTICE([LDFLAGS=$LDFLAGS])
+ AC_MSG_NOTICE([X_LIBS=$X_LIBS])
+
+ AC_MSG_CHECKING([whether a simple Qt program compiles])
+ FUN_QT_COMPILE([AC_MSG_RESULT([yes])], [
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([cannot compile a Qt program!])
+ ])
AC_SUBST(MOC)
AC_SUBST(UIC)
QT_CXXFLAGS="-I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui -I$qt_dir_include/QtAssistant -I$qt_dir_include/QtNetwork"
AC_SUBST(QT_CXXFLAGS)
- QT_LDFLAGS="-L$qt_dir_lib"
+ if test "x$qt_dir_lib" = xdefault; then
+ QT_LDFLAGS=""
+ else
+ QT_LDFLAGS="-L$qt_dir_lib"
+ fi
AC_SUBST(QT_LDFLAGS)
QT_LIBS="$qt_libs"
AC_SUBST(QT_LIBS)
@@ -134,17 +153,13 @@
AC_LANG_PUSH(C++)
- AC_MSG_NOTICE([qt_dir_lib=$qt_dir_lib])
- AC_MSG_NOTICE([LDFLAGS=$LDFLAGS])
- AC_MSG_NOTICE([X_LIBS=$X_LIBS])
-
- AC_MSG_CHECKING([whether a simple Qt program compiles])
-
ac_cxxflags_save="$CXXFLAGS"
ac_ldflags_save="$LDFLAGS"
ac_libs_save="$LIBS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS -I$qt_dir_include -I$qt_dir_include/QtCore -I$qt_dir_include/QtGui $X_CFLAGS $all_includes"
- LDFLAGS="$LDFLAGS -L$qt_dir_lib"
+ if test "x$qt_dir_lib" != xdefault; then
+ LDFLAGS="$LDFLAGS -L$qt_dir_lib"
+ fi
LIBS="$LIBS $PTHREAD_LIBS $qt_libs"
AC_TRY_LINK([
@@ -161,10 +176,5 @@
AC_LANG_POP(C++)
- if test "x$qt_compile" = "xyes" ; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot compile a Qt program!])
- fi
+ AS_IF([test "x$qt_compile" = "xyes"], [$1], [$2])
])#FUN_QT_COMPILE
# Begin bundle
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
FCQeiQ26gA==
