summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Vadim Intelegator <intelegator@gmail.com> 2016-04-13 11:24:27 +0300
committerAvatar Heiko Becker <heirecka@exherbo.org> 2016-04-28 16:23:24 +0200
commit96e210fd24ef01c8fb232875694f98870d4d04bd (patch)
treea44dc0d177ffc1d42d55cd3697bd5a99c0546b4a
parent1f38bda9fb610fa1b1b8b58a1457ed1514003f67 (diff)
downloadgames-96e210fd24ef01c8fb232875694f98870d4d04bd.tar.gz
games-96e210fd24ef01c8fb232875694f98870d4d04bd.tar.xz
openttd: bump version to 1.6.0
Change-Id: I066960a56c12d88b83603c58597e374eb6b468a4 Reviewed-on: https://galileo.mailstation.de/gerrit/5699 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/games-simulation/openttd/files/openttd-1.6.0-gcc6.patch (renamed from packages/games-simulation/openttd/files/openttd-1.5.3-gcc6.patch)0
-rw-r--r--packages/games-simulation/openttd/openttd-1.6.0.exheres-0 (renamed from packages/games-simulation/openttd/openttd-1.5.3.exheres-0)8
2 files changed, 2 insertions, 6 deletions
diff --git a/packages/games-simulation/openttd/files/openttd-1.5.3-gcc6.patch b/packages/games-simulation/openttd/files/openttd-1.6.0-gcc6.patch
index e925bc2..e925bc2 100644
--- a/packages/games-simulation/openttd/files/openttd-1.5.3-gcc6.patch
+++ b/packages/games-simulation/openttd/files/openttd-1.6.0-gcc6.patch
diff --git a/packages/games-simulation/openttd/openttd-1.5.3.exheres-0 b/packages/games-simulation/openttd/openttd-1.6.0.exheres-0
index bbea083..57c1f07 100644
--- a/packages/games-simulation/openttd/openttd-1.5.3.exheres-0
+++ b/packages/games-simulation/openttd/openttd-1.6.0.exheres-0
@@ -45,22 +45,18 @@ DEPENDENCIES="
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/compiler-detection.patch
- "${FILES}"/openttd-1.5.3-gcc6.patch
+ "${FILES}"/openttd-1.6.0-gcc6.patch
)
DEFAULT_SRC_COMPILE_PARAMS=( VERBOSE=1 )
src_configure() {
- # remove once "(svn r27360) -Feature: allow configuring pkg-config in one go for all libraries" lands in a release
- # https://git.openttd.org/?p=trunk.git;a=commit;h=501ee2105a50547ea8817d277fd9e10d0a931d07
- edo sed -e "/pkg_config_call=/s:\"pkg-config:\"${PKG_CONFIG}:" \
- -i config.lib
-
local myconf=(
--build=$(exhost --build)
--host=$(exhost --target)
--cc-build=$(exhost --build)-cc
--cxx-build=$(exhost --build)-c++
+ --pkg-config=${PKG_CONFIG}
--CFLAGS_BUILD="$(print-build-flags CFLAGS)"
--CXXFLAGS_BUILD="$(print-build-flags CXXFLAGS)"
--LDFLAGS_BUILD="$(print-build-flags LDFLAGS)"