moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

wxWidgets: fix cross compilation

Browse source 
xbps-src: add wx-config to 02-script-wrapper.sh
This commit is contained in:
newbluemoon 2017-11-11 23:05:20 +01:00 • committed by Jürgen Buchmüller
parent 2b9193d473
commit e8842e10d7
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/hooks/pre-configure/02-script-wrapper.sh
View file

@ -130,6 +130,8 @@ hook() {
generic_wrapper libmikmod-config
generic_wrapper pcre-config
generic_wrapper net-snmp-config
generic_wrapper wx-config
generic_wrapper wx-config-3.0
generic_wrapper2 curl-config
generic_wrapper2 gpg-error-config
generic_wrapper2 libassuan-config

28
srcpkgs/wxWidgets/template
View file

@ -1,7 +1,7 @@
# Template file for 'wxWidgets'
pkgname=wxWidgets
version=3.0.3.1
revision=2
revision=3
build_style=gnu-configure
configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
--with-libnotify"
@ -15,10 +15,6 @@ makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-dev
distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2"
checksum=3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4
# Cross compiling works, but then wx-config is wrong for native builds
# on target.
nocross=yes
wxWidgets-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
@ -29,5 +25,27 @@ wxWidgets-devel_package() {
vmove usr/bin
vmove usr/lib/wx
ln -sf wx-config-3.0 ${PKGDESTDIR}/usr/bin/wx-config
ln -sf wxrc-3.0 ${PKGDESTDIR}/usr/bin/wxrc
# remove all occurrences of $XBPS_CROSS_TRIPLET
# wx-config:
# - mark this build as native build
# - ignore --host option; breaks configure scripts when
# cross compiling (isn’t necessary in our case anyway)
if [ -n "$CROSS_BUILD" ]; then
local _config="gtk2-unicode-3.0"
mv ${PKGDESTDIR}/usr/lib/wx/include/{${XBPS_CROSS_TRIPLET}-${_config},${_config}}
rename "${XBPS_CROSS_TRIPLET}-" "" ${PKGDESTDIR}/usr/lib/wx/config/*
rename -- "-${XBPS_CROSS_TRIPLET}" "" ${PKGDESTDIR}/usr/lib/*
sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
-e "s/-${XBPS_CROSS_TRIPLET}//g" \
-e 's/is_cross() { \[ "xyes" = "xyes" \]; }/is_cross() { \[ "xno" = "xyes" \]; }/g' \
-e 's/--\*=\*)/--host=\*) continue;;\n\n --\*=\*)/' \
${PKGDESTDIR}/usr/lib/wx/config/${_config}
ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
fi
}
}