[Pkg-postgresql-public] Bug#750112: libpq-dev: arch-dependent files in "Multi-Arch: same" package

Jakub Wilk jwilk at debian.org
Sun Jun 1 18:19:04 UTC 2014 

Package: libpq-dev
Version: 9.4~beta1-2
Severity: important
User: multiarch-devel at lists.alioth.debian.org
Usertags: multiarch

libpq-dev is marked as "Multi-Arch: same", but the following files are 
architecture-dependent:

/usr/include/postgresql/pg_config.h
/usr/include/postgresql/pg_config_ext.h
/usr/bin/pg_config

An example diff between i386 and amd64 is attached.

-- 
Jakub Wilk
-------------- next part --------------
Binary files libpq-dev_9.4~beta1-2_i386/usr/bin/pg_config and libpq-dev_9.4~beta1-2_amd64/usr/bin/pg_config differ
diff -ur libpq-dev_9.4~beta1-2_i386/usr/include/postgresql/pg_config.h libpq-dev_9.4~beta1-2_amd64/usr/include/postgresql/pg_config.h
--- libpq-dev_9.4~beta1-2_i386/usr/include/postgresql/pg_config.h	2014-05-30 21:48:37.000000000 +0200
+++ libpq-dev_9.4~beta1-2_amd64/usr/include/postgresql/pg_config.h	2014-05-30 20:45:58.000000000 +0200
@@ -8,7 +8,7 @@
 #define ACCEPT_TYPE_ARG2 struct sockaddr *
 
 /* Define to the type of arg 3 of 'accept' */
-#define ACCEPT_TYPE_ARG3 size_t
+#define ACCEPT_TYPE_ARG3 socklen_t
 
 /* Define to the return type of 'accept' */
 #define ACCEPT_TYPE_RETURN int
@@ -17,16 +17,16 @@
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* The normal alignment of `double', in bytes. */
-#define ALIGNOF_DOUBLE 4
+#define ALIGNOF_DOUBLE 8
 
 /* The normal alignment of `int', in bytes. */
 #define ALIGNOF_INT 4
 
 /* The normal alignment of `long', in bytes. */
-#define ALIGNOF_LONG 4
+#define ALIGNOF_LONG 8
 
 /* The normal alignment of `long long int', in bytes. */
-#define ALIGNOF_LONG_LONG_INT 4
+/* #undef ALIGNOF_LONG_LONG_INT */
 
 /* The normal alignment of `short', in bytes. */
 #define ALIGNOF_SHORT 2
@@ -73,7 +73,7 @@
 
 /* float8, int8, and related values are passed by value if 'true', by
    reference if 'false' */
-#define FLOAT8PASSBYVAL false
+#define FLOAT8PASSBYVAL true
 
 /* Define to 1 if getpwuid_r() takes a 5th argument. */
 #define GETPWUID_R_5ARG 1
@@ -86,7 +86,7 @@
 #endif
 
 /* Define to 1 if you have the `append_history' function. */
-/* #undef HAVE_APPEND_HISTORY */
+#define HAVE_APPEND_HISTORY 1
 
 /* Define to 1 if you have the `cbrt' function. */
 #define HAVE_CBRT 1
@@ -142,10 +142,10 @@
 #define HAVE_DLOPEN 1
 
 /* Define to 1 if you have the <editline/history.h> header file. */
-#define HAVE_EDITLINE_HISTORY_H 1
+/* #undef HAVE_EDITLINE_HISTORY_H */
 
 /* Define to 1 if you have the <editline/readline.h> header file. */
-#define HAVE_EDITLINE_READLINE_H 1
+/* #undef HAVE_EDITLINE_READLINE_H */
 
 /* Define to 1 if you have the `fdatasync' function. */
 #define HAVE_FDATASYNC 1
@@ -305,19 +305,19 @@
 
 /* Define to 1 if constants of type 'long long int' should have the suffix LL.
    */
-#define HAVE_LL_CONSTANTS 1
+/* #undef HAVE_LL_CONSTANTS */
 
 /* Define to 1 if the system has the type `locale_t'. */
 #define HAVE_LOCALE_T 1
 
 /* Define to 1 if `long int' works and is 64 bits. */
-/* #undef HAVE_LONG_INT_64 */
+#define HAVE_LONG_INT_64 1
 
 /* Define to 1 if the system has the type `long long int'. */
 #define HAVE_LONG_LONG_INT 1
 
 /* Define to 1 if `long long int' works and is 64 bits. */
-#define HAVE_LONG_LONG_INT_64 1
+/* #undef HAVE_LONG_LONG_INT_64 */
 
 /* Define to 1 if you have the `mbstowcs_l' function. */
 /* #undef HAVE_MBSTOWCS_L */
@@ -380,10 +380,10 @@
 /* #undef HAVE_READLINE_H */
 
 /* Define to 1 if you have the <readline/history.h> header file. */
-/* #undef HAVE_READLINE_HISTORY_H */
+#define HAVE_READLINE_HISTORY_H 1
 
 /* Define to 1 if you have the <readline/readline.h> header file. */
-/* #undef HAVE_READLINE_READLINE_H */
+#define HAVE_READLINE_READLINE_H 1
 
 /* Define to 1 if you have the `readlink' function. */
 #define HAVE_READLINK 1
@@ -393,7 +393,7 @@
 
 /* Define to 1 if you have the global variable
    'rl_completion_append_character'. */
-/* #undef HAVE_RL_COMPLETION_APPEND_CHARACTER */
+#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
 
 /* Define to 1 if you have the `rl_completion_matches' function. */
 #define HAVE_RL_COMPLETION_MATCHES 1
@@ -640,13 +640,13 @@
 #define HAVE__VA_ARGS 1
 
 /* Define to the appropriate snprintf format for 64-bit ints. */
-#define INT64_FORMAT "%lld"
+#define INT64_FORMAT "%ld"
 
 /* Define to 1 if `locale_t' requires <xlocale.h>. */
 /* #undef LOCALE_T_IN_XLOCALE */
 
 /* Define as the maximum alignment requirement of any C data type. */
-#define MAXIMUM_ALIGNOF 4
+#define MAXIMUM_ALIGNOF 8
 
 /* Define bytes to use libc memset(). */
 #define MEMSET_LOOP_LIMIT 1024
@@ -670,7 +670,7 @@
 #define PACKAGE_VERSION "9.4beta1"
 
 /* Define to the name of a signed 64-bit integer type. */
-#define PG_INT64_TYPE long long int
+#define PG_INT64_TYPE long int
 
 /* Define to the name of the default PostgreSQL service principal in Kerberos
    (GSSAPI). (--with-krb-srvnam=NAME) */
@@ -690,7 +690,7 @@
 #define PG_VERSION_NUM 90400
 
 /* A string containing the version number, platform, and C compiler */
-#define PG_VERSION_STR "PostgreSQL 9.4beta1 on i686-pc-linux-gnu, compiled by gcc (Debian 4.8.2-21) 4.8.2, 32-bit"
+#define PG_VERSION_STR "PostgreSQL 9.4beta1 on x86_64-unknown-linux-gnu, compiled by gcc-4.8.real (Debian 4.8.2-14) 4.8.2, 64-bit"
 
 /* Define to 1 to allow profiling output to be saved separately for each
    process. */
@@ -714,16 +714,16 @@
 #define RELSEG_SIZE 131072
 
 /* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
+#define SIZEOF_LONG 8
 
 /* The size of `off_t', as computed by sizeof. */
 #define SIZEOF_OFF_T 8
 
 /* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 4
+#define SIZEOF_SIZE_T 8
 
 /* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 4
+#define SIZEOF_VOID_P 8
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -735,7 +735,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Define to the appropriate snprintf format for unsigned 64-bit ints. */
-#define UINT64_FORMAT "%llu"
+#define UINT64_FORMAT "%lu"
 
 /* Define to 1 to build with assertion checks. (--enable-cassert) */
 /* #undef USE_ASSERT_CHECKING */
@@ -749,7 +749,7 @@
 
 /* Define to 1 if you want float8, int8, etc values to be passed by value.
    (--enable-float8-byval) */
-/* #undef USE_FLOAT8_BYVAL */
+#define USE_FLOAT8_BYVAL 1
 
 /* Define to 1 if you want 64-bit integer timestamp and interval support.
    (--enable-integer-datetimes) */
@@ -819,7 +819,7 @@
 
 
 /* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
+/* #undef _FILE_OFFSET_BITS */
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 /* #undef _LARGEFILE_SOURCE */
diff -ur libpq-dev_9.4~beta1-2_i386/usr/include/postgresql/pg_config_ext.h libpq-dev_9.4~beta1-2_amd64/usr/include/postgresql/pg_config_ext.h
--- libpq-dev_9.4~beta1-2_i386/usr/include/postgresql/pg_config_ext.h	2014-05-30 21:48:37.000000000 +0200
+++ libpq-dev_9.4~beta1-2_amd64/usr/include/postgresql/pg_config_ext.h	2014-05-30 20:45:58.000000000 +0200
@@ -5,4 +5,4 @@
  */
 
 /* Define to the name of a signed 64-bit integer type. */
-#define PG_INT64_TYPE long long int
+#define PG_INT64_TYPE long int

More information about the Pkg-postgresql-public mailing list