From patchwork Wed Mar 15 10:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 20960 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5E08C6FD1D for ; Wed, 15 Mar 2023 10:42:39 +0000 (UTC) Received: from mail3.bemta32.messagelabs.com (mail3.bemta32.messagelabs.com [195.245.230.82]) by mx.groups.io with SMTP id smtpd.web10.4587.1678876950414200867 for ; Wed, 15 Mar 2023 03:42:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=nqA+54hz; spf=pass (domain: fujitsu.com, ip: 195.245.230.82, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1678876948; i=@fujitsu.com; bh=bbsxSrfCqwHBGPyiF2m812uRqwLX7cEfAjDXwwNt9kU=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=nqA+54hzuMvLWDHRP9L1fXm16MAkXTLXnFiU7WDNpC0ZnX9TVCAqsQyrnZ5UlDgCc iNjj8qP9Uj9iH+z3uRf3nFHIqZP6jJuuXbleZ/F4OCLHVoiSNsd6hTX7qK0yCz1T+u dbT2l83BWt5MSCShmCAD11LwVfVq7XjrNBzOUB3JJ3IL7MmWg+BymnbCt3jYrhj8ut gu77OFmdt4rNVQhI4HOCT67BUA/rDI6QtBJhS7JXhaS9GEdna4bcUexIg2oINQaYl/ 14I+P1oczO/P8bIJXabttR6UlDyKAOI9SRhw0EGZFl03t1wHhEmRiu7ArUMiy20A7c k70NcUqufCBcw== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrBIsWRWlGSWpSXmKPExsViZ8MxSVdkoWC KwYwzrBYXDy9ldmD0OLdxBWMAYxRrZl5SfkUCa8bXf5IFdzQq2k9uYW9g3K7UxcjFISTwhFFi 4vufzBDOdSaJpY3foZw9jBLX9n0Bcjg52ASkJG7c/88GYosI6Essnb0HLM4soCLx4ncPO4gtL BAl8XFaGwuIzSKgKjHj9x6gOAcHr4CTxMbWTJCwhICCxJSH78FaeQUEJU7OfMICMUZC4uCLF8 wQNYoSsy83s0DYFRKN0w8xQdhqElfPbWKewMg/C0n7LCTtCxiZVjGaFqcWlaUW6ZrpJRVlpme U5CZm5uglVukm6qWW6panFpfoGuollhfrpRYX6xVX5ibnpOjlpZZsYgQGYkoxw40djHP6/uod YpTkYFIS5f2zRiBFiC8pP6UyI7E4I76oNCe1+BCjDAeHkgTvnAWCKUKCRanpqRVpmTnAqIBJS 3DwKInwRtQDpXmLCxJzizPTIVKnGHU5nl69spdZiCUvPy9VSpw3HmSGAEhRRmke3AhYhF5ilJ US5mVkYGAQ4ilILcrNLEGVf8UozsGoJMybOxdoCk9mXgncpldARzABHcE7TwDkiJJEhJRUA9M S9zj1OVvdulasfnFZnSEhNf7mhW+MFz/bWDJPNtwglK99aodIANPfUvdtD1nmr3DIObavQ8Iy wfrY1LMfOa4Xhm4/L/5/RXl2znHhHfsOr06ZkF9zNpCpvNNkwtv35wwmP7K4IKk5Q7CQqb0iw Ub3e+uRuG5LyV11fv2TllkfCt8sva3TN+Le+lU3Z93f/Wfri6NqqzcfDvF33e2u0n3XbvOdOp G2G3Ymtk8y2as4Txckb/icvtX2Qf/Zikkdrxdx+JTNuSG36j7XHgbTabt8nstumvtr1aZDFqs Nvp5ckXuV19BBp+HK4in/D52arfBp9rZ//5PN7NPb//9Wvju1aOvd/YwL7kgLnV70LMO/R4ml OCPRUIu5qDgRAGDCRCNLAwAA X-Env-Sender: wangmy@fujitsu.com X-Msg-Ref: server-22.tower-585.messagelabs.com!1678876947!147562!1 X-Originating-IP: [62.60.8.146] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.104.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9385 invoked from network); 15 Mar 2023 10:42:28 -0000 Received: from unknown (HELO n03ukasimr02.n03.fujitsu.local) (62.60.8.146) by server-22.tower-585.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 15 Mar 2023 10:42:28 -0000 Received: from n03ukasimr02.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTP id AEDC81000DB for ; Wed, 15 Mar 2023 10:42:27 +0000 (GMT) Received: from R01UKEXCASM121.r01.fujitsu.local (R01UKEXCASM121 [10.183.43.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTPS id A26291000D2 for ; Wed, 15 Mar 2023 10:42:27 +0000 (GMT) Received: from localhost.localdomain (10.167.225.33) by R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 15 Mar 2023 10:42:26 +0000 From: To: CC: Wang Mingyu Subject: [oe] [meta-oe] [PATCH V2] postgresql: Fix install conflict when enable multilib. Date: Wed, 15 Mar 2023 18:42:11 +0800 Message-ID: <1678876931-19174-1-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.225.33] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) X-Virus-Scanned: ClamAV using ClamSMTP List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 15 Mar 2023 10:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101533 From: Wang Mingyu Error: Transaction test error: file /usr/include/pg_config.h conflicts between attempted installs of lib32-libpq-dev-15.2-r0.armv7ahf_neon and libpq-dev-15.2-r0.aarch64 file /usr/include/pg_config_ext.h conflicts between attempted installs of lib32-libpq-dev-15.2-r0.armv7ahf_neon and libpq-dev-15.2-r0.aarch64 The differences of pg_config_ext.h are as follows: @@ -5,4 +5,4 @@ */ /* Define to the name of a signed 64-bit integer type. */ -#define PG_INT64_TYPE long int +#define PG_INT64_TYPE long long int The differences of pg_config.h are as follows: @@ -11,13 +11,13 @@ #define ALIGNOF_INT 4 /* The normal alignment of `long', in bytes. */ -#define ALIGNOF_LONG 8 +#define ALIGNOF_LONG 4 /* The normal alignment of `long long int', in bytes. */ -/* #undef ALIGNOF_LONG_LONG_INT */ +#define ALIGNOF_LONG_LONG_INT 8 /* The normal alignment of `PG_INT128_TYPE', in bytes. */ -#define ALIGNOF_PG_INT128_TYPE 16 +/* #undef ALIGNOF_PG_INT128_TYPE */ /* The normal alignment of `short', in bytes. */ #define ALIGNOF_SHORT 2 @@ -369,10 +369,10 @@ #define HAVE_LOCALE_T 1 /* Define to 1 if `long int' works and is 64 bits. */ -#define HAVE_LONG_INT_64 1 +/* #undef HAVE_LONG_INT_64 */ /* Define to 1 if `long long int' works and is 64 bits. */ -/* #undef HAVE_LONG_LONG_INT_64 */ +#define HAVE_LONG_LONG_INT_64 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_MBARRIER_H */ @@ -780,7 +780,7 @@ /* #undef HAVE___STRTOULL */ /* Define to the appropriate printf length modifier for 64-bit ints. */ -#define INT64_MODIFIER "l" +#define INT64_MODIFIER "ll" /* Define to 1 if `locale_t' requires . */ /* #undef LOCALE_T_IN_XLOCALE */ @@ -814,10 +814,10 @@ #define PACKAGE_VERSION "15.2" /* Define to the name of a signed 128-bit integer type. */ -#define PG_INT128_TYPE __int128 +/* #undef PG_INT128_TYPE */ /* Define to the name of a signed 64-bit integer type. */ -#define PG_INT64_TYPE long int +#define PG_INT64_TYPE long long int /* Define to the name of the default PostgreSQL service principal in Kerberos (GSSAPI). (--with-krb-srvnam=NAME) */ @@ -845,7 +845,7 @@ #define PG_VERSION_NUM 150002 /* A string containing the version number, platform, and C compiler */ -#define PG_VERSION_STR "PostgreSQL 15.2 on aarch64-poky-linux-gnu, compiled by aarch64-poky-linux-gcc (GCC) 12.2.0, 64-bit" +#define PG_VERSION_STR "PostgreSQL 15.2 on arm-pokymllib32-linux-gnueabi, compiled by arm-pokymllib32-linux-gnueabi-gcc (GCC) 12.2.0, 32-bit" /* Define to 1 to allow profiling output to be saved separately for each process. */ @@ -872,16 +872,16 @@ #define SIZEOF_BOOL 1 /* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 8 +#define SIZEOF_LONG 4 /* 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 8 +#define SIZEOF_SIZE_T 4 /* The size of `void *', as computed by sizeof. */ -#define SIZEOF_VOID_P 8 +#define SIZEOF_VOID_P 4 /* Define to 1 if all of the C90 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for @@ -892,10 +892,10 @@ /* #undef STRERROR_R_INT */ /* Define to 1 to use ARMv8 CRC Extension. */ -#define USE_ARMV8_CRC32C 1 +/* #undef USE_ARMV8_CRC32C */ /* Define to 1 to use ARMv8 CRC Extension with a runtime check. */ -/* #undef USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK */ +#define USE_ARMV8_CRC32C_WITH_RUNTIME_CHECK 1 /* Define to 1 to build with assertion checks. (--enable-cassert) */ /* #undef USE_ASSERT_CHECKING */ @@ -989,7 +989,7 @@ /* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ +#define _FILE_OFFSET_BITS 64 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ /* #undef _LARGEFILE_SOURCE */ Signed-off-by: Wang Mingyu --- meta-oe/recipes-dbs/postgresql/postgresql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 60d44ce979..15ecdeeb2e 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -36,7 +36,7 @@ LEAD_SONAME = "libpq.so" # LDFLAGS for shared libraries export LDFLAGS_SL = "${LDFLAGS}" -inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base +inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base multilib_header CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" @@ -183,6 +183,7 @@ INITSCRIPT_PARAMS = "start 64 . stop 36 0 1 2 3 4 5 6 ." do_install:append() { # install contrib oe_runmake DESTDIR=${D} -C contrib install + oe_multilib_header pg_config.h pg_config_ext.h ecpg_config.h postgresql/server/pg_config.h postgresql/server/pg_config_ext.h # install tutorial install -d -m 0755 ${D}${libdir}/${BPN}/tutorial install ${B}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial