From 0c0e9a32680b893a71b617fe2183e52f7a37d8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 1 Nov 2015 06:07:19 +0100 Subject: [PATCH] flightgear: use system libraries Use more system libraries which the shipped 3rdparty modules can use. This avoids the x86_64-musl internal compiler error reported in #2858 --- srcpkgs/flightgear/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 973d23e8dfc..d6e4aae0238 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,12 +1,13 @@ # Template file for 'flightgear' pkgname=flightgear version=3.4.0 -revision=2 +revision=3 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata" hostmakedepends="cmake fltk pkg-config" makedepends="MesaLib-devel boost-devel freealut-devel glu-devel libfreeglut-devel fltk-devel - libopenal-devel osg-devel plib-devel simgear" + libopenal-devel libgsm-devel speex-devel sqlite-devel osg-devel plib-devel simgear + $(vopt_if qt qt5-devel)" depends="flightgear-data>=${version}" short_desc="Sophisticated flight wimulator" maintainer="Jürgen Buchmüller " @@ -19,8 +20,11 @@ checksum=" b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b" +build_options="qt" if [ "$CROSS_BUILD" ]; then configure_args+=" -DSIMGEAR_COMPILE_TEST_EXITCODE=0" +else + build_options_default="qt" fi post_install() {