From: Wang Mingyu <[email protected]>
Error: Transaction test error:
file /usr/bin/php-config conflicts between attempted installs of
php-dev-8.2.7-r0.core2_64 and lib32-php-dev-8.2.7-r0.i686
file /usr/bin/phpize conflicts between attempted installs of
php-dev-8.2.7-r0.core2_64 and lib32-php-dev-8.2.7-r0.i686
file /usr/include/php/main/build-defs.h conflicts between attempted installs
of php-dev-8.2.7-r0.core2_64 and lib32-php-dev-8.2.7-r0.i686
file /usr/include/php/main/php_config.h conflicts between attempted installs
of php-dev-8.2.7-r0.core2_64 and lib32-php-dev-8.2.7-r0.i686
The differences of php-config are as follows:
@@ -8,16 +8,16 @@
vernum="80207"
include_dir="/usr/include/php"
includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM
-I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
-ldflags=" -L/usr/lib64"
+ldflags=" -L/usr/lib"
libs="-lcrypt -lc-client -lrt -lcrypt -lpam -lbz2 -lrt -lm -ldl -lxml2
-lssl -lcrypto -lsqlite3 -lz -lxml2 -lssl -lcrypto -lsqlite3 -lxml2 -lxml2
-lxml2 -lxml2 -lz -lssl -lcrypto -lcrypt "
-extension_dir='/usr/lib64/php8/extensions/no-debug-non-zts-20220829'
+extension_dir='/usr/lib/php8/extensions/no-debug-non-zts-20220829'
man_dir=`eval echo /usr/share/man`
program_prefix=""
program_suffix=""
exe_extension=""
php_cli_binary=NONE
php_cgi_binary=NONE
-configure_options=" '--build=x86_64-linux' '--host=x86_64-poky-linux'
'--target=x86_64-poky-linux' '--prefix=/usr' '--exec_prefix=/usr'
'--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/usr/libexec'
'--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com'
'--localstatedir=/var' '--libdir=/usr/lib64' '--includedir=/usr/include'
'--oldincludedir=/usr/include' '--infodir=/usr/share/info'
'--mandir=/usr/share/man' '--disable-silent-rules'
'--disable-dependency-tracking' '--with-libtool-sysroot=' '--enable-mbstring'
'--enable-fpm' '--with-libdir=lib64' '--with-gettext=/usr/lib64/..'
'--with-zlib=/usr/lib64/..' '--with-iconv=/usr/lib64/..' '--with-bz2=/usr'
'--with-config-file-path=/etc/php/apache2-php8' 'ac_cv_c_bigendian_php=no'
'--enable-sockets' '--enable-pcntl' '--enable-shared' '--disable-rpath'
'--with-pic' '--libdir=/usr/lib64/php8' '--disable-static' '--with-imap='
'--with-imap-ssl=' '--disable-ipv6' '--disable-mbregex' '--with-mysqli=mysqlnd'
'--with-pdo-mysql=m
ysqlnd' '--enable-opcache' '--with-openssl' '--without-pgsql' '--disable-soap'
'--with-sqlite3=/usr/lib64/..' '--with-pdo-sqlite=/usr/lib64/..'
'--with-valgrind=no' '--enable-nls' 'build_alias=x86_64-linux'
'host_alias=x86_64-poky-linux' 'target_alias=x86_64-poky-linux'
'PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/share/pkgconfig://usr/share/pkgconfig'
'PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig' 'CC=x86_64-poky-linux-gcc -m64
-march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2
-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
--sysroot=' 'CFLAGS= -O2 -pipe -g -feliminate-unused-debug-types
-fcanon-prefix-map -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -g -DPTYS_ARE_GETPT
-DPTYS_ARE_SEARCHED -I/usr/include/apache2 -DHAVE_LIBDL ' 'LDFLAGS=-Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map -Wl,-z,relro,-z,now
-ldl ' 'CPPFLAGS=' 'CPP=x86_64-poky-linux-gcc -E --sysroot= -m64 -march=core2
-mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong
-O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security'
'CXX=x86_64-poky-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse
-fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security --sysroot=' 'CXXFLAGS= -O2 -pipe -g
-feliminate-unused-debug-types -fcanon-prefix-map -fvisibility-inlines-hidden'"
+configure_options=" '--build=x86_64-linux' '--host=i686-pokymllib32-linux'
'--target=i686-pokymllib32-linux' '--prefix=/usr' '--exec_prefix=/usr'
'--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/usr/libexec'
'--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com'
'--localstatedir=/var' '--libdir=/usr/lib' '--includedir=/usr/include'
'--oldincludedir=/usr/include' '--infodir=/usr/share/info'
'--mandir=/usr/share/man' '--disable-silent-rules'
'--disable-dependency-tracking' '--with-libtool-sysroot=' '--enable-mbstring'
'--enable-fpm' '--with-libdir=lib' '--with-gettext=/usr/lib/..'
'--with-zlib=/usr/lib/..' '--with-iconv=/usr/lib/..' '--with-bz2=/usr'
'--with-config-file-path=/etc/php/apache2-php8' 'ac_cv_c_bigendian_php=no'
'--enable-sockets' '--enable-pcntl' '--enable-shared' '--disable-rpath'
'--with-pic' '--libdir=/usr/lib/php8' '--disable-static' '--with-imap='
'--with-imap-ssl=' '--disable-ipv6' '--disable-mbregex' '--with-mysqli=mysqlnd'
'--with-pdo-mysql=mys
qlnd' '--enable-opcache' '--with-openssl' '--without-pgsql' '--disable-soap'
'--with-sqlite3=/usr/lib/..' '--with-pdo-sqlite=/usr/lib/..'
'--with-valgrind=no' '--enable-nls' 'build_alias=x86_64-linux'
'host_alias=i686-pokymllib32-linux' 'target_alias=i686-pokymllib32-linux'
'PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/ubinux-dev/ubinux001/contribution/build_xh/tmp/work/i686-pokymllib32-linux/lib32-php/8.2.7-r0/recipe-sysroot//usr/share/pkgconfig'
'PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig' 'CC=i686-pokymllib32-linux-gcc -m32
-march=i686 -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security -D_TIME_BITS=64
-D_FILE_OFFSET_BITS=64 --sysroot=' 'CFLAGS= -O2 -pipe -g
-feliminate-unused-debug-types -fcanon-prefix-map -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED
-I/usr/include/apache2 -DHAVE_LIBDL ' 'LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu
-Wl,--as-needed -fcanon-prefix-map -Wl,-z,relro,-z,now -ldl ' 'CPPFLAGS
=' 'CPP=i686-pokymllib32-linux-gcc -E --sysroot= -m32 -march=i686
-fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64'
'CXX=i686-pokymllib32-linux-g++ -m32 -march=i686 -fstack-protector-strong -O2
-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 --sysroot=' 'CXXFLAGS= -O2 -pipe -g
-feliminate-unused-debug-types -fcanon-prefix-map -fvisibility-inlines-hidden'"
The differences of phpize are as follows:
@@ -4,7 +4,7 @@
prefix='/usr'
datarootdir='/usr/php'
exec_prefix="`eval echo /usr`"
-phpdir="`eval echo /usr/lib64/php8`/build"
+phpdir="`eval echo /usr/lib/php8`/build"
includedir="`eval echo /usr/include`/php"
builddir="`pwd`"
SED="sed"
The differences of build-defs.h are as follows:
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-#define CONFIGURE_COMMAND " '../php-8.2.7/configure' '--build=x86_64-linux'
'--host=x86_64-poky-linux' '--target=x86_64-poky-linux' '--prefix=/usr'
'--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin'
'--libexecdir=/usr/libexec' '--datadir=/usr/share' '--sysconfdir=/etc'
'--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/usr/lib64'
'--includedir=/usr/include' '--oldincludedir=/usr/include'
'--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules'
'--disable-dependency-tracking' '--with-libtool-sysroot=' '--enable-mbstring'
'--enable-fpm' '--with-libdir=lib64' '--with-gettext=/usr/lib64/..'
'--with-zlib=/usr/lib64/..' '--with-iconv=/usr/lib64/..' '--with-bz2=/usr'
'--with-config-file-path=/etc/php/apache2-php8' 'ac_cv_c_bigendian_php=no'
'--enable-sockets' '--enable-pcntl' '--enable-shared' '--disable-rpath'
'--with-pic' '--libdir=/usr/lib64/php8' '--disable-static' '--with-imap='
'--with-imap-ssl=' '--disable-ipv6' '--disable-mbregex' '--with-m
ysqli=mysqlnd' '--with-pdo-mysql=mysqlnd' '--enable-opcache' '--with-openssl'
'--without-pgsql' '--disable-soap' '--with-sqlite3=/usr/lib64/..'
'--with-pdo-sqlite=/usr/lib64/..' '--with-valgrind=no' '--enable-nls'
'build_alias=x86_64-linux' 'host_alias=x86_64-poky-linux'
'target_alias=x86_64-poky-linux'
'PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/share/pkgconfig://usr/share/pkgconfig'
'PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig' 'CC=x86_64-poky-linux-gcc -m64
-march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2
-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
--sysroot=' 'CFLAGS= -O2 -pipe -g -feliminate-unused-debug-types
-fcanon-prefix-map -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -g -DPTYS_ARE_GETPT
-DPTYS_ARE_SEARCHED -I/usr/include/apache2 -DHAVE_LIBDL ' 'LDFLAGS=-Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -fcanon-prefix-map -Wl,-z,relro,-z,now
-ldl ' 'CPPFLAGS=' 'CPP=x86_64-poky-linux-gcc -E --sysroot= -m64 -march=core2
-mtune=core2 -msse3 -mf
pmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security' 'CXX=x86_64-poky-linux-g++ -m64
-march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2
-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
--sysroot=' 'CXXFLAGS= -O2 -pipe -g -feliminate-unused-debug-types
-fcanon-prefix-map -fvisibility-inlines-hidden'"
+#define CONFIGURE_COMMAND " '../php-8.2.7/configure' '--build=x86_64-linux'
'--host=i686-pokymllib32-linux' '--target=i686-pokymllib32-linux'
'--prefix=/usr' '--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin'
'--libexecdir=/usr/libexec' '--datadir=/usr/share' '--sysconfdir=/etc'
'--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/usr/lib'
'--includedir=/usr/include' '--oldincludedir=/usr/include'
'--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules'
'--disable-dependency-tracking' '--with-libtool-sysroot=' '--enable-mbstring'
'--enable-fpm' '--with-libdir=lib' '--with-gettext=/usr/lib/..'
'--with-zlib=/usr/lib/..' '--with-iconv=/usr/lib/..' '--with-bz2=/usr'
'--with-config-file-path=/etc/php/apache2-php8' 'ac_cv_c_bigendian_php=no'
'--enable-sockets' '--enable-pcntl' '--enable-shared' '--disable-rpath'
'--with-pic' '--libdir=/usr/lib/php8' '--disable-static' '--with-imap='
'--with-imap-ssl=' '--disable-ipv6' '--disable-mbregex' '--with-mys
qli=mysqlnd' '--with-pdo-mysql=mysqlnd' '--enable-opcache' '--with-openssl'
'--without-pgsql' '--disable-soap' '--with-sqlite3=/usr/lib/..'
'--with-pdo-sqlite=/usr/lib/..' '--with-valgrind=no' '--enable-nls'
'build_alias=x86_64-linux' 'host_alias=i686-pokymllib32-linux'
'target_alias=i686-pokymllib32-linux'
'PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/ubinux-dev/ubinux001/contribution/build_xh/tmp/work/i686-pokymllib32-linux/lib32-php/8.2.7-r0/recipe-sysroot//usr/share/pkgconfig'
'PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig' 'CC=i686-pokymllib32-linux-gcc -m32
-march=i686 -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security -D_TIME_BITS=64
-D_FILE_OFFSET_BITS=64 --sysroot=' 'CFLAGS= -O2 -pipe -g
-feliminate-unused-debug-types -fcanon-prefix-map -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED
-I/usr/include/apache2 -DHAVE_LIBDL ' 'LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu
-Wl,--as-needed -fcanon-prefix-map -W
l,-z,relro,-z,now -ldl ' 'CPPFLAGS=' 'CPP=i686-pokymllib32-linux-gcc -E
--sysroot= -m32 -march=i686 -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2
-Wformat -Wformat-security -Werror=format-security -D_TIME_BITS=64
-D_FILE_OFFSET_BITS=64' 'CXX=i686-pokymllib32-linux-g++ -m32 -march=i686
-fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 --sysroot='
'CXXFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map
-fvisibility-inlines-hidden'"
#define PHP_ODBC_CFLAGS ""
#define PHP_ODBC_LFLAGS ""
#define PHP_ODBC_LIBS ""
@@ -24,12 +24,12 @@
#define PHP_PROG_SENDMAIL "/usr/sbin/sendmail"
#define PEAR_INSTALLDIR ""
#define PHP_INCLUDE_PATH ".:"
-#define PHP_EXTENSION_DIR
"/usr/lib64/php8/extensions/no-debug-non-zts-20220829"
+#define PHP_EXTENSION_DIR
"/usr/lib/php8/extensions/no-debug-non-zts-20220829"
#define PHP_PREFIX "/usr"
#define PHP_BINDIR "/usr/bin"
#define PHP_SBINDIR "/usr/sbin"
#define PHP_MANDIR "/usr/share/man"
-#define PHP_LIBDIR "/usr/lib64/php8"
+#define PHP_LIBDIR "/usr/lib/php8"
#define PHP_DATADIR "/usr/share"
#define PHP_SYSCONFDIR "/etc"
#define PHP_LOCALSTATEDIR "/var"
The differences of php_config.h are as follows:
@@ -2064,7 +2064,7 @@
/* #undef SIZEOF_INTMAX_T */
/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
+#define SIZEOF_LONG 4
/* The size of `long long', as computed by sizeof. */
#define SIZEOF_LONG_LONG 8
@@ -2079,7 +2079,7 @@
#define SIZEOF_SHORT 2
/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 8
+#define SIZEOF_SIZE_T 4
/* Size of ssize_t */
#define SIZEOF_SSIZE_T 8
Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
---
meta-oe/recipes-devtools/php/php_8.1.29.bb | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/php/php_8.1.29.bb
b/meta-oe/recipes-devtools/php/php_8.1.29.bb
index 7a11de7ef..2b3cfd58c 100644
--- a/meta-oe/recipes-devtools/php/php_8.1.29.bb
+++ b/meta-oe/recipes-devtools/php/php_8.1.29.bb
@@ -41,7 +41,7 @@ CVE_CHECK_IGNORE += "\
CVE-2007-4596 \
"
-inherit autotools pkgconfig python3native gettext
+inherit autotools pkgconfig python3native gettext multilib_header
multilib_script
# phpize is not scanned for absolute paths by default (but php-config is).
#
@@ -201,6 +201,14 @@ do_install:append:class-target() {
fi
}
+MULTILIB_SCRIPTS += "${PN}:${bindir}/php-config \
+ ${PN}:${bindir}/phpize \
+"
+
+do_install:append () {
+ oe_multilib_header php/main/build-defs.h php/main/php_config.h
+}
+
SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess"
php_sysroot_preprocess () {
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#111456):
https://lists.openembedded.org/g/openembedded-devel/message/111456
Mute This Topic: https://lists.openembedded.org/mt/107606944/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
