jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wxWidgets-gtk3: fix some cross builds.

Browse source 
Projects that include <wx/setup.h> use wx-config to get flags for where
it's located. For example, "-I
/usr/armv7l-linux-musleabihf/lib/wx/include/gtk3-unicode-3.0".
Unfortunately, wx-config uses libdir from the native package,
/usr/lib$host_wordsize, which breaks cross builds for targets with
different word sizes.

Fix this by changing "lib$wordsize" to "lib".

Fixes #27495
This commit is contained in:
Érico Rolim 2021-01-26 15:36:17 -03:00 committed by Érico Nogueira Rolim
parent 0a03e2ae60
commit aecd085a91
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
srcpkgs/wxWidgets-gtk3/template
View file

@ -1,7 +1,7 @@
# Template file for 'wxWidgets-gtk3' # Template file for 'wxWidgets-gtk3'
pkgname=wxWidgets-gtk3 pkgname=wxWidgets-gtk3
version=3.0.5.1 version=3.0.5.1
revision=3 revision=4
wrksrc="wxWidgets-${version}" wrksrc="wxWidgets-${version}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
@ -34,11 +34,12 @@ post_install() {
ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3 ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3
# - ignore --host option; breaks configure scripts when # - ignore --host option; breaks configure scripts when
# cross compiling (isn’t necessary in our case anyway) # cross compiling (isn’t necessary in our case anyway)
sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \ vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \ -e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
-e 's/is_cross().*/is_cross() { false; }/g' \ -e 's/is_cross().*/is_cross() { false; }/g' \
-e '/--\*=\*)/i --host=\*) continue;;' \ -e '/--\*=\*)/i --host=\*) continue;;' \
$DESTDIR/usr/lib/wx/config/gtk3-unicode-3.0 -e "s/lib${XBPS_WORDSIZE}/lib/g" \
$DESTDIR/usr/lib/wx/config/${_config}
} }
wxWidgets-common_package() { wxWidgets-common_package() {