summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2017-04-17 09:16:05 +0200
committerDavid Seifert <soap@gentoo.org>2017-04-17 09:16:57 +0200
commit8654aff319226a42ca2d112c42009abdcd0fb2f0 (patch)
tree0e2a063e948508a9487a12ade8f81a7294b30b16 /games-util
parentdev-util/aruba: add ruby22 (diff)
downloadgentoo-8654aff319226a42ca2d112c42009abdcd0fb2f0.tar.gz
gentoo-8654aff319226a42ca2d112c42009abdcd0fb2f0.tar.bz2
gentoo-8654aff319226a42ca2d112c42009abdcd0fb2f0.zip
games-util/atlas: Fix -Wnarrowing failures for GCC 6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=612986 Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'games-util')
-rw-r--r--games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild22
1 files changed, 11 insertions, 11 deletions
diff --git a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
index 4599d1f6bcbc..9b36eace1d2a 100644
--- a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
+++ b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools eutils
+inherit autotools
MY_PN=atlas-hgcode
MY_PV=e183e3b3a0412b504edcb3664445b3e04fd484a2
@@ -20,12 +20,12 @@ IUSE=""
COMMON_DEPEND="
media-libs/freeglut
- media-libs/glew:0
- >=media-libs/libpng-1.5:0
+ media-libs/glew:0=
+ media-libs/libpng:0=
net-misc/curl
sys-libs/zlib
virtual/glu
- virtual/jpeg:*
+ virtual/jpeg:0
virtual/opengl
"
DEPEND="${COMMON_DEPEND}
@@ -42,19 +42,20 @@ PATCHES=(
"${FILESDIR}/${P}-simgear-compilation.patch"
)
-DOCS=(AUTHORS NEWS README)
-
src_prepare() {
- default_src_prepare
+ default
+
+ # -Wnarrowing failure, #612986
+ sed -i -e 's:0x:(char)0x:g' src/tiles.h || die
+
eautoreconf
}
src_configure() {
econf \
- --datadir=/usr/share/flightgear \
- --disable-dependency-tracking \
+ --datadir="${EPREFIX}"/usr/share/flightgear \
--enable-simgear-shared \
- --with-fgbase=/usr/share/flightgear
+ --with-fgbase="${EPREFIX}"/usr/share/flightgear
}
pkg_postinst() {
@@ -62,5 +63,4 @@ pkg_postinst() {
elog "Atlas --path=[path of map images] --udp=[port number]"
elog "and start fgfs with the following switch (or in .fgfsrc):"
elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp"
- echo
}