diff options
author | 2016-07-28 20:40:42 +0200 | |
---|---|---|
committer | 2016-07-28 20:42:35 +0200 | |
commit | 1dbc416c580541beeb0be7c7b5774b43c2f42b5a (patch) | |
tree | 0915dc5a5031e40130a578f100e0cad474ac3fa6 | |
parent | dwarf-fortress-0.43.05 from Hello71 (diff) | |
download | eroen-1dbc416c580541beeb0be7c7b5774b43c2f42b5a.tar.gz eroen-1dbc416c580541beeb0be7c7b5774b43c2f42b5a.tar.bz2 eroen-1dbc416c580541beeb0be7c7b5774b43c2f42b5a.zip |
dwarf-fortress-0.43.05 - multilibify!
-rw-r--r-- | games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild | 107 | ||||
-rw-r--r-- | games-roguelike/dwarf-fortress/files/dwarf-fortress | 3 |
2 files changed, 77 insertions, 33 deletions
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild index 9a47165..f667e6f 100644 --- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild +++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild @@ -4,7 +4,8 @@ EAPI=6 -inherit versionator +MULTILIB_COMPAT=( abi_x86_{32,64} ) +inherit multilib-build toolchain-funcs versionator MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)") MY_PN=df @@ -12,63 +13,105 @@ MY_P=${MY_PN}_${MY_PV} DESCRIPTION="A single-player fantasy game" HOMEPAGE="http://www.bay12games.com/dwarves" -SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 ) - x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )" +SRC_URI="abi_x86_64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 ) + abi_x86_32? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )" LICENSE="free-noncomm BSD BitstreamVera" SLOT="0" KEYWORDS="~amd64 ~x86 -*" IUSE="debug" -RDEPEND="media-libs/glew - media-libs/libsdl[joystick,video] - media-libs/sdl-image[png] - media-libs/sdl-ttf - sys-libs/zlib - virtual/glu - x11-libs/gtk+:2" +RDEPEND="media-libs/glew[${MULTILIB_USEDEP}] + media-libs/libsdl[joystick,video,${MULTILIB_USEDEP}] + media-libs/sdl-image[png,${MULTILIB_USEDEP}] + media-libs/sdl-ttf[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}]" # Yup, libsndfile, openal and ncurses are only needed at compile-time; the code # dlopens them at runtime if requested. DEPEND="${RDEPEND} - media-libs/libsndfile - media-libs/openal - sys-libs/ncurses[unicode] - virtual/pkgconfig" + media-libs/libsndfile[${MULTILIB_USEDEP}] + media-libs/openal[${MULTILIB_USEDEP}] + sys-libs/ncurses[unicode,${MULTILIB_USEDEP}] + virtual/pkgconfig[${MULTILIB_USEDEP}]" -S=${WORKDIR}/${MY_PN}_linux +S=${WORKDIR} gamesdir="/opt/${PN}" QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress" RESTRICT="strip" +src_unpack() { + abi_src_unpack() { + case "$MULTILIB_ABI_FLAG" in + abi_x86_32) local f=${MY_P}_linux32.tar.bz2 ;; + abi_x86_64) local f=${MY_P}_linux.tar.bz2 ;; + *) die ;; + esac + unpack "$f" + mv "df_linux" "$BUILD_DIR" || die + } + multilib_foreach_abi abi_src_unpack +} + src_prepare() { - rm -f libs/*.so* || die - sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die - default + abi_src_prepare() { + cd "$BUILD_DIR" || die + rm -f libs/*.so* || die + sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die + default_src_prepare + } + multilib_foreach_abi abi_src_prepare } src_configure() { - tc-export CXX PKG_CONFIG CXXFLAGS+=" -D$(use debug || echo N)DEBUG" } src_compile() { - emake -f "${FILESDIR}/Makefile.native" - sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die + abi_src_compile() { + tc-export PKG_CONFIG + cd "$BUILD_DIR" || die + emake -f "${FILESDIR}/Makefile.native" + + if multilib_is_native_abi; then + local install="\${HOME}/.dwarf-fortress-${PV}" exe="./libs/Dwarf_Fortress" + else + local install="\${HOME}/.dwarf-fortress-${PV}_${MULTILIB_ABI_FLAG}" exe="./libs_${MULTILIB_ABI_FLAG}/Dwarf_Fortress" + fi + sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" \ + -e "s:^install=.*:install=\"${install}\":" \ + -e "s:^exe=.*:exe=\"${exe}\":" \ + "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die + } + multilib_foreach_abi abi_src_compile } src_install() { - # install data-files and libs - insinto "${gamesdir}" - doins -r raw data libs - - # install our wrapper - dobin dwarf-fortress - - # install docs - dodoc README.linux *.txt - - fperms 755 "${gamesdir}"/libs/Dwarf_Fortress + abi_src_install() { + cd "$BUILD_DIR" || die + + # install data-files and libs + insinto "${gamesdir}" + doins -r raw data libs + + # install our wrapper + if multilib_is_native_abi; then + dobin dwarf-fortress + else + newbin dwarf-fortress "dwarf-fortress_${MULTILIB_ABI_FLAG}" + fi + + # install docs + dodoc README.linux *.txt + + fperms 755 "${gamesdir}"/libs/Dwarf_Fortress + if ! multilib_is_native_abi; then + mv "${ED}${gamesdir}/libs" "${ED}${gamesdir}/libs_${MULTILIB_ABI_FLAG}" + fi + } + multilib_foreach_abi abi_src_install } pkg_postinst() { diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress b/games-roguelike/dwarf-fortress/files/dwarf-fortress index a3b0387..c8efe18 100644 --- a/games-roguelike/dwarf-fortress/files/dwarf-fortress +++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress @@ -2,6 +2,7 @@ gamesdir=/opt/dwarf-fortress install="$HOME/.dwarf-fortress" +exe="./libs/Dwarf_Fortress" do_install() { # -n switch requires GNU cp 7.1 @@ -22,4 +23,4 @@ else fi cd "$install" || exit -exec ./libs/Dwarf_Fortress "$@" +exec "$exe" "$@" |