On Sat, 3 Oct 2020 23:09:51 +0200
Rafael Sadowski <rafael@sizeofvoid.org>:
> On Sat Oct 03, 2020 at 10:19:12PM +0200, Solene Rapenne wrote:
> > This diff updates barony to version 3.3.7 which
> > matches the version available on GOG for download
> > and should bring support for latest DLC that I don't
> > own so I didn't test.
> >
> > I had to patch the thread library detection and rework the patch
> > on the CMake because the original file changed too much.
> >
> > Rapidjson is now required, I added a new DISTFILE and an environment
> > variable to cmake to gives the path to the files.
> >
> > I have one issue though that I made a really ugly fix to be able
> > to continue and check if the engine was working with the assets.
> >
> > It seems cmake doesn't copy the "lang" directory at the build time
> > and fails during fake-target
> >
> > ===> Faking installation for barony-3.3.7
> > [0/1] cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 && /usr/local/bin/cmake -P cmake_install.cmake
> > -- Install configuration: "Release"
> > -- Installing: /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-bin
> > -- Installing: /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-editor
> > CMake Error at cmake_install.cmake:89 (file):
> > file INSTALL cannot find
> > "/home/build/usr/ports/pobj/barony-3.3.7/build-amd64/lang": No such file or
> > directory.
> >
> > FAILED: CMakeFiles/install.util
> > cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 && /usr/local/bin/cmake -P cmake_install.cmake
> > ninja: build stopped: subcommand failed.
> > *** Error 1 in . (/home/build/usr/ports/devel/cmake/cmake.port.mk:39 'do-install': @cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:3005 '/home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/.fake_done')
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2116 '/home/build/usr/ports/packages/amd64/all/barony-3.3.7.tgz': @cd ...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2605 '_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CAC...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584 'package': @:; cd /usr/ports/games/barony && PKGPATH=games/barony...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2137 '/var/db/pkg/barony-3.3.7/+CONTENTS': @cd /usr/ports/games/barony...)
> > *** Error 2 in /usr/ports/games/barony (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584 'install': @lock=barony-3.3.7; export _LOC...)
> >
> >
> > My fix is the following, I don't know how to fix this in Cmake or
> > if it's okay enough to commit with this:
>
> You can change "${CMAKE_CURRENT_BINARY_DIR}/lang" to
> ${CMAKE_CURRENT_SOURCE_DIR}/lang or simply lang (without
> ${CMAKE_CURRENT_BINARY_DIR}/"). Full diff below.
>
> :
Thank you very much, it builds fine with your changes.
Is this issue OpenBSD related or should I report it upstream?
No comments:
Post a Comment