From: Wang Mingyu <wan...@fujitsu.com> Error: Transaction test error: file /usr/include/unixODBC/config.h conflicts between attempted installs of unixodbc-dev-2.3.11-r0.aarch64 and lib32-unixodbc-dev-2.3.11-r0.armv7ahf_neon file /usr/include/unixODBC/unixodbc_conf.h conflicts between attempted installs of unixodbc-dev-2.3.11-r0.aarch64 and lib32-unixodbc-dev-2.3.11-r0.armv7ahf_neon file /usr/include/unixodbc.h conflicts between attempted installs of unixodbc-dev-2.3.11-r0.aarch64 and lib32-unixodbc-dev-2.3.11-r0.armv7ahf_neon
The differences of config.h are as follows: @@ -14,7 +14,7 @@ /* #undef C_ALLOCA */ /* Lib directory */ -#define DEFLIB_PATH "/usr/lib64" +#define DEFLIB_PATH "/usr/lib" /* Using perdriver iconv */ /* #undef ENABLE_DRIVER_ICONV */ @@ -275,7 +275,7 @@ #define INCLUDE_PREFIX "/usr/include" /* Lib directory */ -#define LIB_PREFIX "/usr/lib64" +#define LIB_PREFIX "/usr/lib" /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -311,7 +311,7 @@ #define PACKAGE_VERSION "2.3.11" /* Platform is 64 bit */ -#define PLATFORM64 /**/ +/* #undef PLATFORM64 */ /* Install prefix */ #define PREFIX "/usr" @@ -323,10 +323,10 @@ #define SHLIBEXT ".so" /* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 8 +#define SIZEOF_LONG 4 /* The size of `long int', as computed by sizeof. */ -#define SIZEOF_LONG_INT 8 +#define SIZEOF_LONG_INT 4 /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -351,7 +351,7 @@ #define SYSTEM_FILE_PATH "/etc" /* Lib path */ -#define SYSTEM_LIB_PATH "/usr/lib64" +#define SYSTEM_LIB_PATH "/usr/lib" /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This macro is obsolete. */ @@ -383,7 +383,7 @@ /* #undef _ALL_SOURCE */ /* 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 */ The differences of unixodbc_conf.h are as follows: @@ -19,7 +19,7 @@ /* #undef C_ALLOCA */ /* Lib directory */ -#define DEFLIB_PATH "/usr/lib64" +#define DEFLIB_PATH "/usr/lib" /* Using perdriver iconv */ /* #undef ENABLE_DRIVER_ICONV */ @@ -342,7 +342,7 @@ #define INCLUDE_PREFIX "/usr/include" /* Lib directory */ -#define LIB_PREFIX "/usr/lib64" +#define LIB_PREFIX "/usr/lib" /* Define if the OS needs help to load dependent libraries for dlopen(). */ /* #undef LTDL_DLOPEN_DEPLIBS */ @@ -396,7 +396,7 @@ /* Define to the version of this package. */ /* Platform is 64 bit */ -#define PLATFORM64 /**/ +/* #undef PLATFORM64 */ /* Install prefix */ #define PREFIX "/usr" @@ -408,7 +408,7 @@ #define SHLIBEXT ".so" /* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 8 +#define SIZEOF_LONG 4 /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -431,7 +431,7 @@ #define SYSTEM_FILE_PATH "/etc" /* Lib path */ -#define SYSTEM_LIB_PATH "/usr/lib64" +#define SYSTEM_LIB_PATH "/usr/lib" /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #define TIME_WITH_SYS_TIME 1 The differences of unixodbc.h are as follows: @@ -14,4 +14,4 @@ #define HAVE_UNISTD_H 1 /* Define to the value of sizeof(long) */ -#define SIZEOF_LONG_INT 8 +#define SIZEOF_LONG_INT 4 Signed-off-by: Wang Mingyu <wan...@fujitsu.com> --- meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb index c7d23d1202..39112587ed 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267 UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools-brokensep +inherit autotools-brokensep multilib_header S = "${WORKDIR}/unixODBC-${PV}" @@ -26,3 +26,7 @@ do_configure:prepend() { rm -rf m4/* rm -fr libltdl } + +do_install:append() { + oe_multilib_header unixodbc.h unixODBC/config.h unixODBC/unixodbc_conf.h +} -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101485): https://lists.openembedded.org/g/openembedded-devel/message/101485 Mute This Topic: https://lists.openembedded.org/mt/97515561/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-