fontconfig: Branch 'master'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



 .gitlab-ci/linux-mingw-w64-64bit.txt |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b2a54dfb8fe3859cf8c7f1d1d9b43318ef2a0ca3
Author: Nirbheek Chauhan <nirbheek@xxxxxxxxxxxxxxx>
Date:   Wed Nov 4 17:43:21 2020 +0530

    meson: Fix build failure with gcc10 on mingw
    
    We were explicitly setting c_args and c_link_args to [], which
    overrode the values inherited from the env via CFLAGS and LDFLAGS.
    
    Also add a comment for future reference.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/263

diff --git a/.gitlab-ci/linux-mingw-w64-64bit.txt b/.gitlab-ci/linux-mingw-w64-64bit.txt
index 0535654..fd4a640 100644
--- a/.gitlab-ci/linux-mingw-w64-64bit.txt
+++ b/.gitlab-ci/linux-mingw-w64-64bit.txt
@@ -5,8 +5,9 @@ cpu = 'x86_64'
 endian = 'little'
 
 [properties]
-c_args = []
-c_link_args = []
+# Will be picked up from env vars if not defined here
+#c_args = []
+#c_link_args = []
 
 [binaries]
 c = 'x86_64-w64-mingw32-gcc'
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig



[Index of Archives]     [Fedora Fonts]     [Fedora Users]     [Fedora Cloud]     [Kernel]     [Fedora Packaging]     [Fedora Desktop]     [PAM]     [Gimp Graphics Editor]     [Yosemite News]

  Powered by Linux