depends: qt: Fix {C{,XX},LD}FLAGS pickup #16837

pull dongcarl wants to merge 2 commits into bitcoin:master from dongcarl:2019-09-fix-qt-cflags-pickup changing 1 files +3 −3
  1. dongcarl commented at 7:14 pm on September 9, 2019: member
    Note: Will Did open issue about robustness of sed calls in depends.
  2. depends: qt: Fix C{,XX}FLAGS pickup 6eb12ffcbd
  3. dongcarl added the label Build system on Sep 9, 2019
  4. dongcarl added the label Needs gitian build on Sep 9, 2019
  5. in depends/packages/qt.mk:181 in 6eb12ffcbd outdated 
    177@@ -178,9 +178,9 @@ define $(package)_preprocess_cmds
178   patch -p1 -i $($(package)_patch_dir)/no-xlib.patch &&\
179   echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
180   echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
181-  sed -i.old "s|QMAKE_CFLAGS            = |!host_build: QMAKE_CFLAGS            = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
    laanwj commented at 4:00 pm on September 10, 2019:
    FWIW if you use bash as shell, you need to escape the ! here to not get a -bash: !host_build: event not found error (I tried executing this command separately to test it)
    dongcarl commented at 5:24 pm on September 10, 2019:
    Should we explicitly set SHELL then? The default is /bin/sh I think.
    laanwj commented at 10:05 am on September 12, 2019:
    /bin/sh means nothing specific, it’s the default system shell. Isn’t it theoretically possible for /bin/sh to be bash? Escaping the ! would be easier, I guess. Not that it necessarily needs to be solved, here, it’s not a new problem, I was just surprised.
    dongcarl commented at 3:03 pm on September 16, 2019:
    Ah gotcha, perhaps you know this already: when argv[0] looks like it’s sh, I believe bash will be in posix-compliant mode.
  6. DrahtBot commented at 4:23 pm on September 10, 2019: member

    Gitian builds for commit 8af835a72d15d19e98ce22d21903cc0d080d3b92 (master):

    Gitian builds for commit 97190bf15cb1890e4ac94b33ce46157dd1d3fc3b (master and this pull):

  7. DrahtBot removed the label Needs gitian build on Sep 10, 2019
  8. in depends/packages/qt.mk:182 in 6eb12ffcbd outdated 
    177@@ -178,9 +178,9 @@ define $(package)_preprocess_cmds
178   patch -p1 -i $($(package)_patch_dir)/no-xlib.patch &&\
179   echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
180   echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
181-  sed -i.old "s|QMAKE_CFLAGS            = |!host_build: QMAKE_CFLAGS            = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
182+  sed -i.old "s|QMAKE_CFLAGS           += |!host_build: QMAKE_CFLAGS            = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
183   sed -i.old "s|QMAKE_LFLAGS            = |!host_build: QMAKE_LFLAGS            = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
    laanwj commented at 4:26 pm on September 10, 2019:
    doesn’t look like this line is working, there’s no bare “QMAKE_LFLAGS” in my win32-g++/qmake.conf at all (qt 5.9.7 nor 5.9.8)
    dongcarl commented at 3:17 pm on September 16, 2019:
    Digging a little into this… It would seem that QMAKE_LFAGS was removed in https://github.com/qt/qtbase/commit/39fc377bf105ba09e2a8f9acae467dc789b96525, and first made it into qt v5.9.0. We can just add QMAKE_LFLAGS = $($(package)_ldflags) back in though.
    dongcarl commented at 4:58 pm on September 16, 2019:
    See 1b4030e26450b0f9320d64714d8e8dee37b050d2 for my fix.
    laanwj commented at 12:49 pm on September 18, 2019:
    Looks good to me, thanks for addressing this
  9. fanquake added the label Waiting for author on Sep 15, 2019
  10. depends: qt: Fix LDFLAGS pickup 
    QMAKE_LFLAGS was removed from qtbase/mkspecs/win32-g++/qmake.conf in
39fc377bf105ba09e2a8f9acae467dc789b96525. Here, we add it back in with
our LDFLAGS from depends before the first occurance of any
QMAKE_LFLAGS_* variable settings.
    1b4030e264
  11. dongcarl force-pushed on Sep 16, 2019
  12. fanquake removed the label Waiting for author on Sep 17, 2019
  13. dongcarl renamed this:
    depends: qt: Fix C{,XX}FLAGS pickup
    depends: qt: Fix {C{,XX},LD}FLAGS pickup
    on Sep 17, 2019
  14. fanquake referenced this in commit cc1d7fd57c on Sep 18, 2019
  15. laanwj added the label Needs gitian build on Sep 18, 2019
  16. laanwj commented at 12:42 pm on September 18, 2019: member
    Requested a new gitian build. ACK from me if it passes.
  17. DrahtBot commented at 2:17 pm on September 19, 2019: member

    Gitian builds for commit 4b5e5ef4cec38cb2e3ea4a509e9d90a2088a18c1 (master):

    Gitian builds for commit 5fde90b6f2802d409e67136fe0431e53b6182d80 (master and this pull):

  18. DrahtBot removed the label Needs gitian build on Sep 19, 2019
  19. sidhujag referenced this in commit ccbf64836d on Sep 23, 2019
  20. laanwj commented at 11:19 am on September 26, 2019: member
    ACK 1b4030e26450b0f9320d64714d8e8dee37b050d2
  21. laanwj referenced this in commit 003f2d20b1 on Sep 26, 2019
  22. laanwj merged this on Sep 26, 2019
  23. laanwj closed this on Sep 26, 2019
  24. sidhujag referenced this in commit 2cf7e753ae on Sep 26, 2019
  25. deadalnix referenced this in commit 82a135ab37 on Apr 3, 2020
  26. UdjinM6 referenced this in commit bd311c3654 on Dec 18, 2020
  27. PastaPastaPasta referenced this in commit cad871801d on Jun 27, 2021
  28. PastaPastaPasta referenced this in commit 512b60afdc on Jun 28, 2021
  29. PastaPastaPasta referenced this in commit eaa3781020 on Jun 29, 2021
  30. PastaPastaPasta referenced this in commit 3a73302be0 on Jul 1, 2021
  31. PastaPastaPasta referenced this in commit 8424bfff25 on Jul 1, 2021
  32. PastaPastaPasta referenced this in commit 768c1d46e0 on Jul 12, 2021
  33. PastaPastaPasta referenced this in commit 6638fa763c on Jul 13, 2021
  34. kittywhiskers referenced this in commit b0e9022a5b on Nov 24, 2021
  35. PastaPastaPasta referenced this in commit 25a965d691 on Nov 30, 2021
  36. DrahtBot locked this on Dec 16, 2021


dongcarl laanwj DrahtBot

Labels
Build system

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-12-18 21:12 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me