diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2021-07-25 12:24:06 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2021-07-25 12:45:20 -0400 |
| commit | cc94c41489790dde45313e0f4d890e1b39b0c43e (patch) | |
| tree | a175dd3e2186f37bd6ed2ea14bd5dd20ef0fff86 | |
| parent | sys-apps/shadow: Revbump to install man pages (diff) | |
| download | gentoo-cc94c41489790dde45313e0f4d890e1b39b0c43e.tar.gz gentoo-cc94c41489790dde45313e0f4d890e1b39b0c43e.tar.bz2 gentoo-cc94c41489790dde45313e0f4d890e1b39b0c43e.zip | |
games-rpg/openglad: switch to premake:5 to handle race condition
5 works even with old premake4.lua and generates different rules that
doesn't seem like can race to create objects before the object dir
(not that 100% sure that fixes it).
Given nothing else in the tree depends on premake:4, also little
reason to hold on to that version if this works.
Closes: https://bugs.gentoo.org/804154
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
| -rw-r--r-- | games-rpg/openglad/openglad-0.98_p20200907.ebuild | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/games-rpg/openglad/openglad-0.98_p20200907.ebuild b/games-rpg/openglad/openglad-0.98_p20200907.ebuild index 132a5ea39795..33e42ea2dcea 100644 --- a/games-rpg/openglad/openglad-0.98_p20200907.ebuild +++ b/games-rpg/openglad/openglad-0.98_p20200907.ebuild @@ -26,7 +26,7 @@ RDEPEND=" media-libs/sdl2-mixer" DEPEND="${RDEPEND}" BDEPEND=" - dev-util/premake:4 + dev-util/premake:5 virtual/pkgconfig" src_prepare() { @@ -51,15 +51,25 @@ src_configure() { append-cppflags $($(tc-getPKG_CONFIG) --cflags "${pkgs[@]}" || die) append-libs $($(tc-getPKG_CONFIG) --libs "${pkgs[@]}" || die) - premake4 gmake || die + premake5 gmake || die } src_compile() { - emake verbose=y ARCH= CC="$(tc-getCC)" CXX="$(tc-getCXX)" LIBS="${LIBS}" + local emakeargs=( + config=release + verbose=y + ARCH= # build assumes this is -m64 and tries to pass it to the compiler + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + LIBS="${LIBS}" + ALL_LDFLAGS="${LDFLAGS}" # only used to override -s + ) + + emake "${emakeargs[@]}" } src_install() { - dobin ${PN} + dobin bin/Release/${PN} insinto /usr/share/${PN} doins -r builtin cfg extra_campaigns pix sound @@ -69,5 +79,5 @@ src_install() { einstalldocs doicon "${DISTDIR}"/${PN}.png - make_desktop_entry openglad Openglad + make_desktop_entry ${PN} ${PN^} } |