-
Notifications
You must be signed in to change notification settings - Fork 6.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[glew] Only set the base address on x86 (32bit) #31084
[glew] Only set the base address on x86 (32bit) #31084
Conversation
This PR should be handled after #30996.
|
Please not that CI won't test the key change unless you remove |
Alright, I will wait for #30996 to be merged. |
nigels-com/glew#384 upstream PR (merged) |
You should really start doing this now. |
34cc8e2
to
8c8882e
Compare
I cancelled the build because it merge conflicts with dg0yt's PR, which just merged. I tried to push a merge for you but you didn't open the PR with permission for me to do that for you. |
Hi Billy, I am already working on it... I will push in a few minutes. |
ports/blend2d/vcpkg.json
Outdated
"description": "Beta 2D Vector Graphics Powered by a JIT Compiler", | ||
"homepage": "https://github.com/blend2d/blend2d", | ||
"documentation": "https://blend2d.com/doc/index.html", | ||
"license": "Zlib", | ||
"supports": "!(arm & windows) & !uwp & !wasm32", | ||
"supports": "!((arm | arm64) & windows) & !uwp & !wasm32", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
arm
includes arm64
in these expressions. No change to this port needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean: This particular change should be reverted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I didn't know that. Sure, I will revert the change. Thanks for your feedback!
ports/osgearth/vcpkg.json
Outdated
"description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", | ||
"homepage": "https://github.com/gwaldron/osgearth", | ||
"license": "LGPL-3.0-or-later", | ||
"supports": "!(x86 | wasm32)", | ||
"supports": "!(((arm | arm64) & windows) | x86 | wasm32)", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
arm
includes arm64
in these expressions.
However, I'm unsure if this change should be here at all. Do we know that it really doesn't support arm64-windows?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a dependency to blend2d and that doesn't build on arm64-windows.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. But this dependency is in feature blend2d. And it is not pulled in by default for arm & windows
, so this port should just build regardless of glew.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CI failed because of blend2d, that's why I made the change.
Anyways, I reverted the change. It should fail for the same reason. Then you can advise the best course of action.
FTR android CI tests were added only a few minutes ago... |
xeus on android is a baseline regression, cf. #31098. |
@dg0yt ah, you did it already. Thank you! |
Tried to merge following dg0yt's PR getting merged but still not allowed by the PR OP. |
Not sure why this is happening. I haven't done anything for it to be like that. Maybe it's because I used the repo in the namespace of my organization...? |
@BillyONeal Thank you! |
Now there is another issue with osgearth. Git executable can't be found. How does that make sense, when the other PR was just merged? osgearth config-arm64-windows-out.log[1/2] "D:/downloads/tools/cmake-3.25.1-windows/cmake-3.25.1-windows-i386/bin/cmake.exe" -E chdir "../../arm64-windows-dbg" "D:/downloads/tools/cmake-3.25.1-windows/cmake-3.25.1-windows-i386/bin/cmake.exe" "D:/buildtrees/osgearth/src/05a55a9c16-32b5b64a2e.clean" "-G" "Ninja" "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_INSTALL_PREFIX=D:/packages/osgearth_arm64-windows/debug" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DOSGEARTH_BUILD_TOOLS=OFF" "-DWITH_BLEND2D=OFF" "-DLIB_POSTFIX=" "-DCMAKE_CXX_STANDARD=11" "-DOSGEARTH_BUILD_SHARED_LIBS=1" "-DOSGEARTH_BUILD_EXAMPLES=OFF" "-DOSGEARTH_BUILD_TESTS=OFF" "-DOSGEARTH_BUILD_DOCS=OFF" "-DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=OFF" "-DOSGEARTH_BUILD_TRITON_NODEKIT=OFF" "-DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF" "-DWITH_EXTERNAL_TINYXML=ON" "-DCMAKE_JOB_POOL_LINK=console" "-DCMAKE_MAKE_PROGRAM=C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe" "-DBUILD_SHARED_LIBS=ON" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=C:/a/1/s/scripts/toolchains/windows.cmake" "-DVCPKG_TARGET_TRIPLET=arm64-windows" "-DVCPKG_SET_CHARSET_FLAG=ON" "-DVCPKG_PLATFORM_TOOLSET=v143" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DVCPKG_APPLOCAL_DEPS=OFF" "-DCMAKE_TOOLCHAIN_FILE=C:/a/1/s/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" "-DVCPKG_CXX_FLAGS=" "-DVCPKG_CXX_FLAGS_RELEASE=" "-DVCPKG_CXX_FLAGS_DEBUG=" "-DVCPKG_C_FLAGS=" "-DVCPKG_C_FLAGS_RELEASE=" "-DVCPKG_C_FLAGS_DEBUG=" "-DVCPKG_CRT_LINKAGE=dynamic" "-DVCPKG_LINKER_FLAGS=" "-DVCPKG_LINKER_FLAGS_RELEASE=" "-DVCPKG_LINKER_FLAGS_DEBUG=" "-DVCPKG_TARGET_ARCHITECTURE=arm64" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=C:/a/1/s" "-D_VCPKG_INSTALLED_DIR=D:/installed" "-DVCPKG_MANIFEST_INSTALL=OFF" "-DOSGEARTH_BUILD_TOOLS=OFF" -- The C compiler identification is MSVC 19.35.32217.1 -- The CXX compiler identification is MSVC 19.35.32217.1 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.35.32215/bin/Hostx64/arm64/cl.exe - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.35.32215/bin/Hostx64/arm64/cl.exe - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- Found OpenGL: opengl32 -- Found Fontconfig: D:/installed/arm64-windows/debug/lib/fontconfig.lib (found version "2.14.2") -- Found Freetype: optimized;D:/installed/arm64-windows/lib/freetype.lib;debug;D:/installed/arm64-windows/debug/lib/freetyped.lib (found version "2.12.1") -- Found EXPAT: optimized;D:/installed/arm64-windows/lib/libexpat.lib;debug;D:/installed/arm64-windows/debug/lib/libexpatd.lib (found version "2.5.0") -- Found OpenSSL: optimized;D:/installed/arm64-windows/lib/libcrypto.lib;debug;D:/installed/arm64-windows/debug/lib/libcrypto.lib (found suitable version "3.1.0", minimum required is "3") -- Found ZLIB: optimized;D:/installed/arm64-windows/lib/zlib.lib;debug;D:/installed/arm64-windows/debug/lib/zlibd.lib (found suitable version "1.2.13", minimum required is "1") -- Found Protobuf: optimized;D:/installed/arm64-windows/lib/libprotobuf.lib;debug;D:/installed/arm64-windows/debug/lib/libprotobufd.lib (found version "3.21.12") -- Performing Test CMAKE_HAVE_LIBC_PTHREAD -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed -- Looking for pthread_create in pthreads -- Looking for pthread_create in pthreads - not found -- Looking for pthread_create in pthread -- Looking for pthread_create in pthread - not found -- Found Threads: TRUE -- Found BZip2: optimized;D:/installed/arm64-windows/lib/bz2.lib;debug;D:/installed/arm64-windows/debug/lib/bz2d.lib (found version "1.0.8") -- Looking for BZ2_bzCompressInit -- Looking for BZ2_bzCompressInit - found -- Found OpenSSL: optimized;D:/installed/arm64-windows/lib/libcrypto.lib;debug;D:/installed/arm64-windows/debug/lib/libcrypto.lib (found version "3.1.0") -- Found ZLIB: optimized;D:/installed/arm64-windows/lib/zlib.lib;debug;D:/installed/arm64-windows/debug/lib/zlibd.lib (found version "1.2.13") -- Found GDAL 3.6.4 -- Found OSG version 3.6.5 -- Creating D:/buildtrees/osgearth/arm64-windows-dbg/build_include/osgEarth/BuildConfig.h CMake Warning (dev) at D:/downloads/tools/cmake-3.25.1-windows/cmake-3.25.1-windows-i386/share/cmake-3.25/Modules/FindPackageHandleStandardArgs.cmake:438 (message): The package name passed to `find_package_handle_standard_args` (Git) does not match the name of the calling package (git). This can lead to problems in calling code that expects `find_package` result variables (e.g., `_FOUND`) to follow a certain pattern. Call Stack (most recent call first): D:/downloads/tools/cmake-3.25.1-windows/cmake-3.25.1-windows-i386/share/cmake-3.25/Modules/FindGit.cmake:128 (find_package_handle_standard_args) C:/a/1/s/scripts/buildsystems/vcpkg.cmake:852 (_find_package) src/osgEarth/CMakeLists.txt:506 (find_package) This warning is for project developers. Use -Wno-dev to suppress it.-- Could NOT find Git (missing: GIT_EXECUTABLE)
|
I looked at the new osgearth error logs. My suggestion is to change that port's "supports": "!(arm | x86 | wasm32)", AFAICS this doesn't remove any triplet which is currently tested in CI. The restriction can be lifted in a separate PR with the next update, or with patching. Similar to our ping-pong with glew: I just transformed the existing restriction. The hard work is lifting the restriction... |
We were posting in parallel ... the git warning is harmless (and not related to arm64-windows). The real error is during build, cf. install log. |
@dg0yt ah yes... I didn't notice that. osgearth install-arm64-windows-dbg-out.log[328/445] C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1435~1.322\bin\Hostx64\arm64\cl.exe /TP -DCURL_STATICLIB -DOSGEARTH_HAVE_GEOS -DOSGEARTH_HAVE_MBTILES -DOSGEARTH_HAVE_MVT -DOSGEARTH_HAVE_PROTOBUF -DOSGEARTH_HAVE_SQLITE3 -DOSGEARTH_LIBRARY -DTIXML_USE_STL -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D__STDC_FORMAT_MACROS -DosgEarth_EXPORTS -ID:\buildtrees\osgearth\arm64-windows-dbg\build_include -ID:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src -ID:\buildtrees\osgearth\arm64-windows-dbg\src\osgEarth -external:ID:\installed\arm64-windows\include -external:ID:\installed\arm64-windows\include\geos -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Fosrc\osgEarth\CMakeFiles\osgEarth.dir\ModelNode.cpp.obj /Fdsrc\osgEarth\CMakeFiles\osgEarth.dir\ /FS -c D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarth\ModelNode.cpp [328/445] cmd.exe /C "cd . && D:\downloads\tools\cmake-3.25.1-windows\cmake-3.25.1-windows-i386\bin\cmake.exe -E vs_link_dll --intdir=src\osgEarth\CMakeFiles\osgEarth.dir --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100226~1.0\x64\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100226~1.0\x64\mt.exe --manifests -- C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1435~1.322\bin\Hostx64\arm64\link.exe @CMakeFiles\osgEarth.rsp /out:lib\osgEarthd.dll /implib:lib\osgEarthd.lib /pdb:lib\osgEarthd.pdb /dll /version:3.3 /machine:ARM64 /nologo /debug /INCREMENTAL /NODEFAULTLIB:MSVCRT && cd ." [351/445] C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1435~1.322\bin\Hostx64\arm64\cl.exe /TP -DCURL_STATICLIB -DOSGEARTH_HAVE_MBTILES -DOSGEARTH_HAVE_PROTOBUF -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -Dosgdb_fastdxt_EXPORTS -ID:\buildtrees\osgearth\arm64-windows-dbg\build_include -ID:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src -external:ID:\installed\arm64-windows\include -external:ID:\installed\arm64-windows\include\geos -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Fosrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\intrinsic.cpp.obj /Fdsrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\ /FS -c D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\fastdxt\intrinsic.cpp FAILED: src/osgEarthDrivers/fastdxt/CMakeFiles/osgdb_fastdxt.dir/intrinsic.cpp.obj C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1435~1.322\bin\Hostx64\arm64\cl.exe /TP -DCURL_STATICLIB -DOSGEARTH_HAVE_MBTILES -DOSGEARTH_HAVE_PROTOBUF -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -Dosgdb_fastdxt_EXPORTS -ID:\buildtrees\osgearth\arm64-windows-dbg\build_include -ID:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src -external:ID:\installed\arm64-windows\include -external:ID:\installed\arm64-windows\include\geos -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Fosrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\intrinsic.cpp.obj /Fdsrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\ /FS -c D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\fastdxt\intrinsic.cpp C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.35.32215\include\emmintrin.h(20): fatal error C1189: #error: This header is specific to X86, X64 and ARM64EC targets [352/445] C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1435~1.322\bin\Hostx64\arm64\cl.exe /TP -DCURL_STATICLIB -DOSGEARTH_HAVE_MBTILES -DOSGEARTH_HAVE_PROTOBUF -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -Dosgdb_fastdxt_EXPORTS -ID:\buildtrees\osgearth\arm64-windows-dbg\build_include -ID:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src -external:ID:\installed\arm64-windows\include -external:ID:\installed\arm64-windows\include\geos -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Fosrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\util.cpp.obj /Fdsrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\ /FS -c D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\fastdxt\util.cpp D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\fastdxt\util.cpp(241): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\fastdxt\util.cpp(244): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [373/445] C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1435~1.322\bin\Hostx64\arm64\cl.exe /TP -DCURL_STATICLIB -DOSGEARTH_HAVE_MBTILES -DOSGEARTH_HAVE_PROTOBUF -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -Dosgdb_fastdxt_EXPORTS -ID:\buildtrees\osgearth\arm64-windows-dbg\build_include -ID:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src -external:ID:\installed\arm64-windows\include -external:ID:\installed\arm64-windows\include\geos -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Fosrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\FastDXTImageProcessor.cpp.obj /Fdsrc\osgEarthDrivers\fastdxt\CMakeFiles\osgdb_fastdxt.dir\ /FS -c D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\fastdxt\FastDXTImageProcessor.cpp D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\fastdxt\FastDXTImageProcessor.cpp(131): warning C4018: '<': signed/unsigned mismatch [380/445] C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1435~1.322\bin\Hostx64\arm64\cl.exe /TP -DOSGEARTH_HAVE_MBTILES -DOSGEARTH_HAVE_PROTOBUF -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -Dosgdb_osgearth_viewpoints_EXPORTS -ID:\buildtrees\osgearth\arm64-windows-dbg\build_include -ID:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src -external:ID:\installed\arm64-windows\include -external:ID:\installed\arm64-windows\include\geos -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Fosrc\osgEarthDrivers\viewpoints\CMakeFiles\osgdb_osgearth_viewpoints.dir\ViewpointsExtension.cpp.obj /Fdsrc\osgEarthDrivers\viewpoints\CMakeFiles\osgdb_osgearth_viewpoints.dir\ /FS -c D:\buildtrees\osgearth\src\05a55a9c16-32b5b64a2e.clean\src\osgEarthDrivers\viewpoints\ViewpointsExtension.cpp ninja: build stopped: subcommand failed.If you are not already on it, I will have a look at it. |
@dg0yt Yeah, I will follow your suggestion. |
versions/g-/glew.json
Outdated
"port-version": 3 | ||
}, | ||
{ | ||
"git-tree": "ca41377df059245d9a8b18c459e67b81a3a51975", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't change the data of the old version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes, I messed up the reversion. I'll fix it. Thank you.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am happy so long as the comment I asked for is added.
Co-authored-by: Billy O'Neal <bion@microsoft.com>
Done. I'll update the version in 10-15 minutes. I just woke up and am not on my computer yet. 😅 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 and thanks to @bold84.
Thanks again! |
Fixes #23301
Fixes #24724
If this PR updates an existing port, please uncomment and fill out this checklist:
./vcpkg x-add-version --all
and committing the result.