From de2efe913349288522b45c48d502002821a1006d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 17 Oct 2015 11:19:36 +0200 Subject: [PATCH] libcec: setup build options correctly for arm/musl. --- srcpkgs/libcec/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index b2cdedf8ed5..19c056a4569 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,7 +1,7 @@ # Template file for 'libcec' pkgname=libcec version=3.0.1 -revision=2 +revision=3 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake hostmakedepends="cmake pkg-config libtool swig" @@ -13,12 +13,11 @@ homepage="https://github.com/Pulse-Eight/libcec" license="GPL-2" distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz" checksum=7e3670c8949a1964d6e5481f56dfff838857da10bdc60b506f6e9b7f117e253e -build_options="rpi" -LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib" -if [ "$XBPS_TARGET_MACHINE" = "armv6l" -o "$XBPS_TARGET_MACHINE" = "armv7l" ]; then - build_options_default="rpi" -fi +build_options="rpi" +case "$XBPS_TARGET_MACHINE" in + armv[67]*) build_options_default="rpi";; +esac if [ "$build_option_rpi" ]; then configure_args+=" -DRPI_INCLUDE_DIR=${XBPS_CROSS_BASE}/opt/vc/include" @@ -42,7 +41,6 @@ cec-client_package() { vmove usr/bin } } - libcec-devel_package() { short_desc+=" - development files" depends="libudev-devel platform-devel libcec>=${version}_${revision}"