On 2020/09/19 12:15, Thomas Frohwein wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2020/09/19 12:15:56
>
> Modified files:
> graphics/mojoshader: Makefile
>
> Log message:
> add new BDEP on graphics/vulkan-headers; pointed out by aja@
> no revision bump as it didn't build without vulkan-headers
>
Build fails for me even with this commit;
/pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_vulkan.c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_vulkan.c:15:10: fatal
error: 'vulkan/vulkan.h' file not found
#include "vulkan/vulkan.h"
^~~~~~~~~~~~~~~~~
1 error generated.
ninja: build stopped: subcommand failed.
Full log follows
>>> Building on i386-1 under graphics/mojoshader
BDEPENDS =
[devel/ninja;devel/sdl2;devel/re2c;devel/cmake;graphics/vulkan-headers]
DIST = [graphics/mojoshader:mojoshader-7a43f238f28a.tar.gz]
FULLPKGNAME = mojoshader-1303
(Junk lock obtained for i386-1 at 1600785879.00)
>>> Running depends in graphics/mojoshader at 1600785879.06
last junk was in games/uqm/uqm
/usr/sbin/pkg_add -aI -Drepair cmake-3.17.2p0v0 ninja-1.10.0 re2c-2.0.3
sdl2-2.0.12 vulkan-headers-1.2.141.0
was: /usr/sbin/pkg_add -aI -Drepair cmake-3.17.2p0v0 ninja-1.10.0 re2c-2.0.3
sdl2-2.0.12 vulkan-headers-1.2.141.0
/usr/sbin/pkg_add -aI -Drepair cmake-3.17.2p0v0 ninja-1.10.0 re2c-2.0.3
sdl2-2.0.12 vulkan-headers-1.2.141.0
>>> Running show-prepare-results in graphics/mojoshader at 1600785881.88
===> graphics/mojoshader
===> mojoshader-1303 depends on: re2c-* -> re2c-2.0.3
===> mojoshader-1303 depends on: sdl2-* -> sdl2-2.0.12
===> mojoshader-1303 depends on: vulkan-headers-* -> vulkan-headers-1.2.141.0
===> mojoshader-1303 depends on: cmake-* -> cmake-3.17.2p0v0
===> mojoshader-1303 depends on: ninja->=1.5.1 -> ninja-1.10.0
===> Verifying specs: m
===> found m.10.1
cmake-3.17.2p0v0
ninja-1.10.0
re2c-2.0.3
sdl2-2.0.12
vulkan-headers-1.2.141.0
(Junk lock released for i386-1 at 1600785882.49)
distfiles size=463609
>>> Running build in graphics/mojoshader at 1600785882.52
===> graphics/mojoshader
===> Checking files for mojoshader-1303
`/mnt/distfiles/mojoshader-7a43f238f28a.tar.gz' is up to date.
>> (SHA256) mojoshader-7a43f238f28a.tar.gz: OK
===> Extracting for mojoshader-1303
===> Patching for mojoshader-1303
===> Applying OpenBSD patch patch-CMakeLists_txt
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-CMakeLists_txt,v 1.3 2020/09/18 18:46:57 thfr Exp $
|
|set version/changeset information manually
|
|Index: CMakeLists.txt
|--- CMakeLists.txt.orig
|+++ CMakeLists.txt
--------------------------
Patching file CMakeLists.txt using Plan A...
Hunk #1 succeeded at 67.
done
===> Applying OpenBSD patch patch-mojoshader_opengl_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-mojoshader_opengl_c,v 1.2 2020/09/18 18:46:57 thfr Exp $
|
|re-add MOJOSHADER_glProgramViewportFlip() for backwards compatibility.
|Was removed by upstream in changeset 1210
|(https://hg.icculus.org/icculus/mojoshader/rev/c586d4590241)
|
|Index: mojoshader_opengl.c
|--- mojoshader_opengl.c.orig
|+++ mojoshader_opengl.c
--------------------------
Patching file mojoshader_opengl.c using Plan A...
Hunk #1 succeeded at 2671.
done
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
===> Generating configure for mojoshader-1303
/usr/bin/perl /usr/ports/infrastructure/bin/pkg_subst -DHG_CHANGESET=1303
-DHG_COMMIT=7a43f238f28a -DMODCMAKE_BUILD_SUFFIX=-release.cmake
-DLIBmojoshader_VERSION=1.0 -DARCH=i386 -DBASE_PKGPATH=graphics/mojoshader
-DFLAVOR_EXT= -DFULLPKGNAME=mojoshader-1303
-DHOMEPAGE=https://icculus.org/mojoshader/ -DLOCALBASE=/usr/local
-DLOCALSTATEDIR=/var -DMACHINE_ARCH=i386 -DMAINTAINER=Thomas\ Frohwein\
\<[email protected]\> -DPREFIX=/usr/local -DRCDIR=/etc/rc.d -DSYSCONFDIR=/etc
-DTRUEPREFIX=/usr/local -DX11BASE=/usr/X11R6 -DPKGSTEM=mojoshader -i -B
/pobj/mojoshader-1303
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/CMakeLists.txt
===> Configuring for mojoshader-1303
-- The C compiler identification is Clang 10.0.1
-- The CXX compiler identification is Clang 10.0.1
-- Check for working C compiler: /pobj/mojoshader-1303/bin/cc
-- Check for working C compiler: /pobj/mojoshader-1303/bin/cc - works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: /pobj/mojoshader-1303/bin/c++
-- Check for working CXX compiler: /pobj/mojoshader-1303/bin/c++ - works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Mercurial (hg) not found. You can go on, but version info will be wrong.
CMake Warning (dev) at CMakeLists.txt:90 (GET_TARGET_PROPERTY):
Policy CMP0026 is not set: Disallow use of the LOCATION target property.
Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy
command to set the policy and suppress this warning.
The LOCATION property should not be read from target "lemon". Use the
target name directly with add_custom_command, or use the generator
expression $<TARGET_FILE>, as appropriate.
This warning is for project developers. Use -Wno-dev to suppress it.
-- Configuring done
-- Generating done
CMake Warning:
Manually-specified variables were not used by the project:
CMAKE_SKIP_INSTALL_ALL_DEPENDENCY
-- Build files have been written to: /pobj/mojoshader-1303/build-i386
===> Building for mojoshader-1303
[1/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/. -I/usr/local/include/SDL2 -O2
-pipe -DNDEBUG -MD -MT CMakeFiles/lemon.dir/misc/lemon.c.o -MF
CMakeFiles/lemon.dir/misc/lemon.c.o.d -o CMakeFiles/lemon.dir/misc/lemon.c.o
-c /pobj/mojoshader-1303/mojoshader-7a43f238f28a/misc/lemon.c
[2/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/. -I/usr/local/include/SDL2 -O2
-pipe -DNDEBUG -MD -MT CMakeFiles/glcaps.dir/utils/glcaps.c.o -MF
CMakeFiles/glcaps.dir/utils/glcaps.c.o.d -o
CMakeFiles/glcaps.dir/utils/glcaps.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/utils/glcaps.c
[3/39] : && /pobj/mojoshader-1303/bin/cc -O2 -pipe -DNDEBUG
CMakeFiles/lemon.dir/misc/lemon.c.o -o lemon
-Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && :
[4/39] : && /pobj/mojoshader-1303/bin/cc -O2 -pipe -DNDEBUG
CMakeFiles/glcaps.dir/utils/glcaps.c.o -o glcaps -L/usr/local/lib -lSDL2 -lm
-Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && :
[5/39] cd /pobj/mojoshader-1303/build-i386 &&
/pobj/mojoshader-1303/build-i386/lemon -q
-T/pobj/mojoshader-1303/mojoshader-7a43f238f28a/misc/lempar.c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_parser_hlsl.lemon
[6/39] cd /pobj/mojoshader-1303/build-i386 && /usr/local/bin/re2c -is
--no-generation-date -o
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_lexer.c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_lexer.re
[7/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/. -I/usr/local/include/SDL2
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include -O2
-pipe -DNDEBUG -MD -MT CMakeFiles/testparse.dir/utils/testparse.c.o -MF
CMakeFiles/testparse.dir/utils/testparse.c.o.d -o
CMakeFiles/testparse.dir/utils/testparse.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/utils/testparse.c
[8/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/. -I/usr/local/include/SDL2
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include -O2
-pipe -DNDEBUG -MD -MT CMakeFiles/testoutput.dir/utils/testoutput.c.o -MF
CMakeFiles/testoutput.dir/utils/testoutput.c.o.d -o
CMakeFiles/testoutput.dir/utils/testoutput.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/utils/testoutput.c
[9/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/. -I/usr/local/include/SDL2
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include -O2
-pipe -DNDEBUG -DFINDERRORS_COMPILE_SHADERS=1 -MD -MT
CMakeFiles/finderrors.dir/utils/finderrors.c.o -MF
CMakeFiles/finderrors.dir/utils/finderrors.c.o.d -o
CMakeFiles/finderrors.dir/utils/finderrors.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/utils/finderrors.c
[10/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/. -I/usr/local/include/SDL2
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include -O2
-pipe -DNDEBUG -MD -MT
CMakeFiles/availableprofiles.dir/utils/availableprofiles.c.o -MF
CMakeFiles/availableprofiles.dir/utils/availableprofiles.c.o.d -o
CMakeFiles/availableprofiles.dir/utils/availableprofiles.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/utils/availableprofiles.c
[11/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader.c
[12/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader_common.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader_common.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader_common.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_common.c
[13/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader_opengl.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader_opengl.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader_opengl.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_opengl.c
[14/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader_metal.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader_metal.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader_metal.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_metal.c
[15/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader_d3d11.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader_d3d11.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader_d3d11.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_d3d11.c
[16/39] /pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_vulkan.c
FAILED: CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o
/pobj/mojoshader-1303/bin/cc -DMOJOSHADER_EFFECT_SUPPORT
-DMOJOSHADER_FLIP_RENDERTARGET -DSUPPORT_PROFILE_METAL=0 -Dmojoshader_EXPORTS
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/.
-I/pobj/mojoshader-1303/mojoshader-7a43f238f28a/../Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -MD -MT
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o -MF
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o.d -o
CMakeFiles/mojoshader.dir/mojoshader_vulkan.c.o -c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_vulkan.c
/pobj/mojoshader-1303/mojoshader-7a43f238f28a/mojoshader_vulkan.c:15:10: fatal
error: 'vulkan/vulkan.h' file not found
#include "vulkan/vulkan.h"
^~~~~~~~~~~~~~~~~
1 error generated.
ninja: build stopped: subcommand failed.
*** Error 1 in graphics/mojoshader (/usr/ports/devel/cmake/cmake.port.mk:34
'do-build': @cd /pobj/mojoshader-1303/build-i386 && exec /usr/bi...)
*** Error 2 in graphics/mojoshader
(/usr/ports/infrastructure/mk/bsd.port.mk:2921
'/pobj/mojoshader-1303/build-i386/.build_done': @cd /usr/p...)
*** Error 2 in graphics/mojoshader
(/usr/ports/infrastructure/mk/bsd.port.mk:2584 'build': @lock=mojoshader-1303;
export _LOCKS_HELD=" mojo...)
===> Exiting graphics/mojoshader with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:137 'build': @:
${echo_msg:=echo}; : ${target:=build}; for i in ; do eval...)
>>> Ended at 1600785889.33
max_stuck=0.00/depends=2.84/show-prepare-results=0.64/build=6.84
Error: job failed with 512 on i386-1 at 1600785889
