Package: libcurl4-gnutls-dev
Version: 7.33.0-2
Severity: important
User: multiarch-de...@lists.alioth.debian.org
Usertags: multiarch
libcurl4-gnutls-dev is marked as "Multi-Arch: same", but the following
files are architecture-dependent:
/usr/bin/curl-config
/usr/include/curl/curlbuild.h
An example diff between i386 and amd64 is attached.
--
Jakub Wilk
diff -ur libcurl4-gnutls-dev_7.33.0-2_i386/usr/bin/curl-config
libcurl4-gnutls-dev_7.33.0-2_amd64/usr/bin/curl-config
--- libcurl4-gnutls-dev_7.33.0-2_i386/usr/bin/curl-config 2013-12-11
20:17:02.000000000 +0100
+++ libcurl4-gnutls-dev_7.33.0-2_amd64/usr/bin/curl-config 2013-12-11
19:13:30.000000000 +0100
@@ -142,8 +142,8 @@
;;
--libs)
- if test "X${prefix}/lib/i386-linux-gnu" != "X/usr/lib" -a
"X${prefix}/lib/i386-linux-gnu" != "X/usr/lib64"; then
- CURLLIBDIR="-L${prefix}/lib/i386-linux-gnu "
+ if test "X${prefix}/lib/x86_64-linux-gnu" != "X/usr/lib" -a
"X${prefix}/lib/x86_64-linux-gnu" != "X/usr/lib64"; then
+ CURLLIBDIR="-L${prefix}/lib/x86_64-linux-gnu "
else
CURLLIBDIR=""
fi
@@ -156,7 +156,7 @@
--static-libs)
if test "Xyes" != "Xno" ; then
- echo ${prefix}/lib/i386-linux-gnu/libcurl.a -Wl,-z,relro
-Wl,--as-needed -lidn -lrtmp -lssh2 -lgcrypt -lgnutls -Wl,-z,relro
-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -llber -llber -lldap -lz
+ echo ${prefix}/lib/x86_64-linux-gnu/libcurl.a -Wl,-z,relro
-Wl,--as-needed -lidn -lrtmp -lssh2 -lgcrypt -lgnutls -Wl,-z,relro
-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -llber -llber -lldap -lz
else
echo "curl was built with static libraries disabled" >&2
exit 1
@@ -164,7 +164,7 @@
;;
--configure)
- echo " '--build=i486-linux-gnu' '--prefix=/usr'
'--includedir=${prefix}/include' '--mandir=${prefix}/share/man'
'--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var'
'--libdir=${prefix}/lib/i386-linux-gnu'
'--libexecdir=${prefix}/lib/i386-linux-gnu' '--disable-maintainer-mode'
'--disable-dependency-tracking' '--disable-symbol-hiding'
'--enable-versioned-symbols' '--enable-threaded-resolver'
'--with-lber-lib=lber' '--with-gssapi=/usr'
'--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt' '--without-ssl'
'--with-gnutls' 'build_alias=i486-linux-gnu' 'CFLAGS=-g -O2 -fstack-protector
--param=ssp-buffer-size=4 -Wformat -Werror=format-security'
'LDFLAGS=-Wl,-z,relro -Wl,--as-needed' 'CPPFLAGS=-D_FORTIFY_SOURCE=2'"
+ echo " '--build=x86_64-linux-gnu' '--prefix=/usr'
'--includedir=${prefix}/include' '--mandir=${prefix}/share/man'
'--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var'
'--libdir=${prefix}/lib/x86_64-linux-gnu'
'--libexecdir=${prefix}/lib/x86_64-linux-gnu' '--disable-maintainer-mode'
'--disable-dependency-tracking' '--disable-symbol-hiding'
'--enable-versioned-symbols' '--enable-threaded-resolver'
'--with-lber-lib=lber' '--with-gssapi=/usr'
'--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt' '--without-ssl'
'--with-gnutls' 'build_alias=x86_64-linux-gnu' 'CFLAGS=-g -O2 -fstack-protector
--param=ssp-buffer-size=4 -Wformat -Werror=format-security'
'LDFLAGS=-Wl,-z,relro -Wl,--as-needed' 'CPPFLAGS=-D_FORTIFY_SOURCE=2'"
;;
*)
diff -ur libcurl4-gnutls-dev_7.33.0-2_i386/usr/include/curl/curlbuild.h
libcurl4-gnutls-dev_7.33.0-2_amd64/usr/include/curl/curlbuild.h
--- libcurl4-gnutls-dev_7.33.0-2_i386/usr/include/curl/curlbuild.h
2013-12-11 20:17:02.000000000 +0100
+++ libcurl4-gnutls-dev_7.33.0-2_amd64/usr/include/curl/curlbuild.h
2013-12-11 19:13:30.000000000 +0100
@@ -133,14 +133,14 @@
/* Configure process defines this to 1 when it finds out that system */
/* header file stdint.h must be included by the external interface. */
-#define CURL_PULL_STDINT_H 1
+/* #undef CURL_PULL_STDINT_H */
#ifdef CURL_PULL_STDINT_H
# include <stdint.h>
#endif
/* Configure process defines this to 1 when it finds out that system */
/* header file inttypes.h must be included by the external interface. */
-#define CURL_PULL_INTTYPES_H 1
+/* #undef CURL_PULL_INTTYPES_H */
#ifdef CURL_PULL_INTTYPES_H
# include <inttypes.h>
#endif
@@ -160,7 +160,7 @@
#endif
/* The size of `long', as computed by sizeof. */
-#define CURL_SIZEOF_LONG 4
+#define CURL_SIZEOF_LONG 8
/* Integral data type used for curl_socklen_t. */
#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
@@ -172,27 +172,27 @@
typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
/* Signed integral data type used for curl_off_t. */
-#define CURL_TYPEOF_CURL_OFF_T int64_t
+#define CURL_TYPEOF_CURL_OFF_T long
/* Data type definition of curl_off_t. */
typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
/* curl_off_t formatting string directive without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_T "lld"
+#define CURL_FORMAT_CURL_OFF_T "ld"
/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_TU "llu"
+#define CURL_FORMAT_CURL_OFF_TU "lu"
/* curl_off_t formatting string directive with "%" conversion specifier. */
-#define CURL_FORMAT_OFF_T "%lld"
+#define CURL_FORMAT_OFF_T "%ld"
/* The size of `curl_off_t', as computed by sizeof. */
#define CURL_SIZEOF_CURL_OFF_T 8
/* curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_T LL
+#define CURL_SUFFIX_CURL_OFF_T L
/* unsigned curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_TU ULL
+#define CURL_SUFFIX_CURL_OFF_TU UL
#endif /* __CURL_CURLBUILD_H */
