Files
meta-openembedded/meta-oe/recipes-support
Wang Mingyu b3d875df4d unixodbc: Fix install conflict when enable multilib.
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 <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-03-10 09:01:54 -08:00
..
2021-10-19 09:23:08 -07:00
2022-07-18 09:11:22 -07:00
2022-08-06 09:12:15 -07:00
2023-03-04 10:41:27 -08:00
2023-02-07 07:01:21 -08:00
2022-09-05 22:49:34 -07:00
2023-02-07 07:01:21 -08:00
2022-11-28 11:32:26 -08:00
2021-08-03 10:21:25 -07:00
2022-08-23 09:55:28 -07:00
2022-12-08 17:10:47 -08:00
2022-12-08 17:10:48 -08:00
2022-09-22 03:51:38 -07:00
2023-01-21 10:02:02 -08:00
2022-09-14 21:33:38 -07:00
2022-09-29 19:18:27 -07:00
2023-03-09 09:10:52 -08:00
2022-08-23 09:55:28 -07:00
2023-01-21 10:02:02 -08:00
2023-03-04 08:45:47 -08:00
2022-03-04 08:28:06 -08:00
2022-04-25 10:44:13 -07:00
2022-03-26 18:15:11 -07:00
2023-03-09 09:10:52 -08:00
2023-03-01 20:22:25 -08:00
2023-01-17 01:05:53 -08:00
2023-02-18 13:19:36 -08:00
2023-03-09 09:10:52 -08:00
2023-01-26 21:52:26 -08:00
2022-10-28 10:05:38 -07:00
2023-03-09 09:10:52 -08:00
2022-09-29 13:32:16 -07:00
2023-03-02 17:45:37 -08:00
2022-03-10 07:31:21 -08:00
2022-08-06 09:12:15 -07:00
2022-07-19 18:38:44 -07:00
2023-03-09 09:10:52 -08:00
2023-03-06 08:41:13 -08:00
2023-02-28 08:50:56 -08:00
2022-10-10 10:19:33 -07:00
2023-01-21 10:02:02 -08:00
2021-08-03 10:21:25 -07:00
2022-05-29 06:39:14 -07:00
2021-08-03 10:21:25 -07:00
2022-09-05 22:49:34 -07:00
2022-10-17 19:19:40 -07:00
2022-11-28 11:32:26 -08:00
2023-03-09 23:45:17 -08:00
2023-01-26 10:24:25 -08:00
2023-02-18 13:19:36 -08:00
2023-02-18 13:19:36 -08:00
2023-01-21 10:02:02 -08:00
2022-09-29 16:15:57 -07:00
2023-03-07 15:00:10 -08:00
2023-02-02 10:25:33 -08:00
2023-01-25 08:57:42 -08:00
2022-07-18 09:11:22 -07:00
2023-01-26 21:52:26 -08:00
2022-03-24 09:45:25 -07:00
2023-03-09 23:45:17 -08:00
2023-01-25 23:18:05 -08:00
2022-12-27 16:03:06 -08:00
2022-02-17 11:12:44 -08:00
2023-02-02 00:10:29 -08:00
2023-03-09 23:45:17 -08:00
2021-08-03 10:21:25 -07:00
2023-03-09 21:58:44 -08:00
2022-11-28 11:32:26 -08:00
2023-01-21 10:02:02 -08:00
2022-03-29 08:28:38 -07:00
2021-08-03 10:21:25 -07:00
2023-01-11 08:37:58 -08:00
2022-12-23 08:52:22 -08:00
2023-01-06 11:38:16 -08:00
2023-02-22 01:03:38 -08:00
2022-11-09 10:17:15 -08:00
2022-03-19 01:45:03 -07:00
2023-03-07 15:00:10 -08:00
2022-09-05 22:49:34 -07:00
2022-02-11 09:10:38 -08:00
2023-02-27 09:43:09 -08:00