[vcpkg baseline][gdk-pixbuf] Fix build error on windows by PhoebeHui · Pull Request #17528 · microsoft/vcpkg

PhoebeHui · 2021-04-27T07:09:25Z

Related to #17431

It looks 'has_function' in https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/meson.build#L93 generate wrong check code here with vs2019. just replace the functions with correct check code. this issue occurred on vs2019, it compiles fine with vs2017.

Fix the failures:
E:\vcpkg\clean\vcpkg\buildtrees\gdk-pixbuf\src\k-pixbuf-2-c86079bed6\gdk-pixbuf\pixops../fallback-c89.c(38): error C2169: 'lrint': intrinsic function, cannot be defined

Upstream issue https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/187.
Meson issue: mesonbuild/meson#8703 mesonbuild/meson#8702.

Neumann-A · 2021-04-27T07:17:59Z

wrong fix the correct fix is to have the check call the function with the correct parameters

PhoebeHui · 2021-04-27T08:39:53Z

@Neumann-A, thanks for your review!

After some investigations, it looks 'has_function' in https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/meson.build#L93 generate wrong check code here with vs2019.

meson.build log:

Running compile:
Working directory:  E:\vcpkg\clean\vcpkg\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmpywbswwxp
Command line:  C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.28.29910/bin/Hostx64/x64/cl.exe -INCREMENTAL:NO -I"E:/vcpkg/clean/vcpkg/installed/x64-windows/include" E:\vcpkg\clean\vcpkg\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmpywbswwxp\testfile.c /FeE:\vcpkg\clean\vcpkg\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmpywbswwxp\output.exe /nologo /showIncludes /MD -nologo -DWIN32 -D_WINDOWS -W3 -utf-8 -MP -MD -O2 -Oi -Gy -DNDEBUG -Z7 /nologo /showIncludes /Od kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /link -machine:x64 -DEBUG -OPT:REF -OPT:ICF /LIBPATH:E:/vcpkg/clean/vcpkg/installed/x64-windows/lib 
Code:
 
        #define lrint meson_disable_define_of_lrint
        
        #include <limits.h>
        #undef lrint
        
        #ifdef __cplusplus
        extern "C"
        #endif
        char lrint (void);
        
        #if defined __stub_lrint || defined __stub___lrint
        fail fail fail this function is not going to work
        #endif
        
        int main(void) {
          return lrint ();
        }
Compiler stdout:
 cl : Command line warning D9030 : '/showIncludes' is incompatible with multiprocessing; ignoring /MP switch
testfile.c
Note: including file: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\limits.h
Note: including file:  C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\vcruntime.h
Note: including file:   C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\sal.h
Note: including file:    C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\concurrencysal.h
Note: including file:   C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\vadefs.h
E:\vcpkg\clean\vcpkg\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmp0ydnp6qn\testfile.c(10): warning C4391: 'char lrint(void)': incorrect return type for intrinsic function, expected 'long'
E:\vcpkg\clean\vcpkg\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmp0ydnp6qn\testfile.c(10): warning C4392: 'char lrint(void)': incorrect number of arguments for intrinsic function, expected '1' arguments
E:\vcpkg\clean\vcpkg\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmp0ydnp6qn\testfile.c(17): error C2168: 'lrint': too few actual parameters for intrinsic function

PhoebeHui · 2021-04-27T08:52:51Z

Related to upstream issue https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/187.

PhoebeHui · 2021-04-27T09:27:34Z

@Neumann-A, we don't know how to correct the args, we just replace the functions with check code.

JackBoosY · 2021-04-27T09:57:16Z

Note this just a workaround to avoid this bug, we need to wait for upstream reply to completely solve this issue.

Neumann-A · 2021-04-27T09:58:59Z

mesonbuild/meson#8703

Neumann-A · 2021-04-27T10:02:47Z

Note this just a workaround to avoid this bug, we need to wait for upstream reply to completely solve this issue.

This also happens with autotools and cmake builds. The only difference is that for those we are able to override the result.

Neumann-A · 2021-04-27T10:09:01Z

I think the trick is to pass /Oi- as an extra compiler argument in the check if msvc is used

PhoebeHui · 2021-04-27T10:36:59Z

I think the trick is to pass /Oi- as an extra compiler argument in the check if msvc is used

It seems related to the option https://docs.microsoft.com/en-us/cpp/build/reference/oi-generate-intrinsic-functions?view=msvc-160.

Neumann-A · 2021-04-27T15:28:58Z

with if cc.has_function('lrint', dependencies: mathlib_dep, args: '-Oi-')

Running compile:
Working directory:  E:\vcpkg_folders\master\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmpbwbo3a9c
Command line:  C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.28.29910/bin/Hostx64/x64/cl.exe -INCREMENTAL:NO -I"E:/vcpkg_folders/master/installed/x64-windows/include" E:\vcpkg_folders\master\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmpbwbo3a9c\testfile.c /FeE:\vcpkg_folders\master\buildtrees\gdk-pixbuf\x64-windows-rel\meson-private\tmpbwbo3a9c\output.exe /nologo /showIncludes /MD -nologo -DWIN32 -D_WINDOWS -W3 -utf-8 -MP -MD -O2 -Oi -Gy -DNDEBUG -Z7 /nologo /showIncludes /Od kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib -Oi- /link -machine:x64 -DEBUG -OPT:REF -OPT:ICF /LIBPATH:E:/vcpkg_folders/master/installed/x64-windows/lib 

Code:
 
        #define lrint meson_disable_define_of_lrint
        
        #include <limits.h>
        #undef lrint
        
        #ifdef __cplusplus
        extern "C"
        #endif
        char lrint (void);
        
        #if defined __stub_lrint || defined __stub___lrint
        fail fail fail this function is not going to work
        #endif
        
        int main(void) {
          return lrint ();
        }
Compiler stdout:
 cl : Command line warning D9030 : '/showIncludes' is incompatible with multiprocessing; ignoring /MP switch
testfile.c
Note: including file: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\limits.h
Note: including file:  C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\vcruntime.h
Note: including file:   C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\sal.h
Note: including file:    C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\concurrencysal.h
Note: including file:   C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include\vadefs.h

Compiler stderr:
 cl : Command line warning D9025 : overriding '/O2' with '/Od'
cl : Command line warning D9025 : overriding '/Oi' with '/Oi-'

Checking for function "lrint" with dependency -lm: YES

ports/gdk-pixbuf/fix_build_error_windows.patch

Neumann-A · 2021-04-27T20:22:17Z

this should be the minimal patch. there is no need to patch round
fix_intrinsic.txt

ports/gdk-pixbuf/fix_build_error_windows.patch

PhoebeHui · 2021-04-28T01:03:11Z

Thanks @Neumann-A for your help! I applied the minimal patch which pass the option '-Oi' to the check function.

PhoebeHui · 2021-04-28T01:11:14Z

With minimal patch, it failed on linux platform:

In file included from ../src/k-pixbuf-2-330a654e51.clean/gdk-pixbuf/pixops/pixops.c:24:0:
../src/k-pixbuf-2-330a654e51.clean/gdk-pixbuf/pixops/../fallback-c89.c:37:1: error: static declaration of ‘lrint’ follows non-static declaration
 lrint (double x)
 ^~~~~
In file included from /usr/include/features.h:424:0,
                 from /usr/include/x86_64-linux-gnu/bits/libc-header-start.h:33,
                 from /usr/include/math.h:27,
                 from ../src/k-pixbuf-2-330a654e51.clean/gdk-pixbuf/pixops/pixops.c:21:
/usr/include/x86_64-linux-gnu/bits/mathcalls.h:314:1: note: previous declaration of ‘lrint’ was here
 __MATHDECL (long int,lrint,, (_Mdouble_ __x));
 ^

PhoebeHui · 2021-04-28T02:18:32Z

@strega-nil-ms, could you help review and merge this PR?

ports/gdk-pixbuf/fix_build_error_windows.patch

[vcpkg baseline][gdk-pixbuf] Fix build error on windows

4be224e

PhoebeHui added category:port-bug The issue is with a library, which is something the port should already support info:internal labels Apr 27, 2021

PhoebeHui assigned JackBoosY Apr 27, 2021

PhoebeHui added 2 commits April 27, 2021 00:18

Format the vcpkg.json

1b0c41c

Update the baseline version

3bfa473

JackBoosY mentioned this pull request Apr 27, 2021

has_function doesn't work on Visual Studio 2019. mesonbuild/meson#8702

Closed

This was referenced Apr 27, 2021

[vcpkg] Add triplet option VCPKG_NO_COMPILER_TRACKING #17526

Merged

[ffmpeg] add openh264 support #17531

Merged

PhoebeHui added 2 commits April 27, 2021 02:24

Update the patch

2889b21

Update the baseline version

5883cf9

PhoebeHui marked this pull request as ready for review April 27, 2021 09:36

JackBoosY approved these changes Apr 27, 2021

View reviewed changes

JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Apr 27, 2021

Neumann-A reviewed Apr 27, 2021

View reviewed changes

ports/gdk-pixbuf/fix_build_error_windows.patch Outdated Show resolved Hide resolved

Neumann-A reviewed Apr 27, 2021

View reviewed changes

ports/gdk-pixbuf/fix_build_error_windows.patch Outdated Show resolved Hide resolved

Neumann-A reviewed Apr 27, 2021

View reviewed changes

ports/gdk-pixbuf/fix_build_error_windows.patch Outdated Show resolved Hide resolved

This was referenced Apr 27, 2021

[comms, commsdsl] update ports #16415

Merged

[gdk-pixbuf] build failure #17538

Closed

strega-nil-ms approved these changes Apr 27, 2021

View reviewed changes

ports/gdk-pixbuf/fix_build_error_windows.patch Outdated Show resolved Hide resolved

ports/gdk-pixbuf/fix_build_error_windows.patch Outdated Show resolved Hide resolved

strega-nil-ms and others added 3 commits April 27, 2021 14:05

Apply suggestions from code review

04dbcea

Apply suggestions from code review

d6a5b9f

Update the baseline version

e7994c5

PhoebeHui linked an issue Apr 28, 2021 that may be closed by this pull request

[gdk-pixbuf] build failure #17538

Closed

PhoebeHui added 2 commits April 27, 2021 18:58

Update the patch

053abc2

Update the baseline version

7085064

NancyLi1013 mentioned this pull request Apr 28, 2021

[libqcow] Fix build issues by updating to 20210419 #17525

Merged

NancyLi1013 mentioned this pull request Apr 28, 2021

[ci] Update macOS to 11 #17376

Merged

JackBoosY suggested changes Apr 28, 2021

View reviewed changes

ports/gdk-pixbuf/fix_build_error_windows.patch Show resolved Hide resolved

JackBoosY approved these changes Apr 28, 2021

View reviewed changes

This was referenced Apr 28, 2021

[cryptopp] Update to 8.5.0 #17533

Merged

[turf, junction] new ports #17540

Closed

[matplotplusplus] Fix find and use dependencies #17552

Merged

JonLiu1993 mentioned this pull request Apr 28, 2021

[Forge] update version to 1.0.7 #17099

Merged

BillyONeal merged commit e01bb32 into microsoft:master Apr 28, 2021

PhoebeHui mentioned this pull request Jun 11, 2021

building package failed (versioning) build failure #18351

Closed

PhoebeHui deleted the dev/Phoebe/gdk-pixbuf branch June 17, 2021 05:42

Conversation

PhoebeHui commented Apr 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Neumann-A commented Apr 27, 2021

Uh oh!

PhoebeHui commented Apr 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PhoebeHui commented Apr 27, 2021

Uh oh!

PhoebeHui commented Apr 27, 2021

Uh oh!

JackBoosY commented Apr 27, 2021

Uh oh!

Neumann-A commented Apr 27, 2021

Uh oh!

Neumann-A commented Apr 27, 2021

Uh oh!

Neumann-A commented Apr 27, 2021

Uh oh!

PhoebeHui commented Apr 27, 2021

Uh oh!

Neumann-A commented Apr 27, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Neumann-A commented Apr 27, 2021

Uh oh!

Uh oh!

Uh oh!

PhoebeHui commented Apr 28, 2021

Uh oh!

PhoebeHui commented Apr 28, 2021

Uh oh!

PhoebeHui commented Apr 28, 2021

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

PhoebeHui commented Apr 27, 2021 •

edited

Loading

PhoebeHui commented Apr 27, 2021 •

edited

Loading