Changeset 139570 in webkit


Ignore:
Timestamp:
Jan 13, 2013 9:18:00 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Fix CONFIG missing link_pkgconfig on Windows
​https://bugs.webkit.org/show_bug.cgi?id=106647

Some libraries (e.g. libxslt, libxml2 and sqlite3) fail to link
properly on Windows because they are added to PKGCONFIG but
CONFIG does not contain link_pkgconfig.

This is because link_pkgconfig is added in unix/default_pre.prf
which is only used for UNIX platforms. To fix this, move it to
the general default_pre.prf.

Patch by Jonathan Liu <​net147@gmail.com> on 2013-01-13
Reviewed by Simon Hausmann.

  • qmake/mkspecs/features/default_pre.prf:
  • qmake/mkspecs/features/unix/default_pre.prf:
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r139560 r139570  
     12013-01-13  Jonathan Liu  <net147@gmail.com>
     2
     3        Fix CONFIG missing link_pkgconfig on Windows
     4        https://bugs.webkit.org/show_bug.cgi?id=106647
     5
     6        Some libraries (e.g. libxslt, libxml2 and sqlite3) fail to link
     7        properly on Windows because they are added to PKGCONFIG but
     8        CONFIG does not contain link_pkgconfig.
     9
     10        This is because link_pkgconfig is added in unix/default_pre.prf
     11        which is only used for UNIX platforms. To fix this, move it to
     12        the general default_pre.prf.
     13
     14        Reviewed by Simon Hausmann.
     15
     16        * qmake/mkspecs/features/default_pre.prf:
     17        * qmake/mkspecs/features/unix/default_pre.prf:
     18
    1192013-01-12  Nico Weber  <thakis@chromium.org>
    220

  • trunk/Tools/qmake/mkspecs/features/default_pre.prf

    r137891 r139570  
    8686CONFIG += include_webinspector
    8787
     88# Make sure we process the PKGCONFIG variable if applicable
     89!mac: CONFIG += link_pkgconfig
     90
    8891# By default we enable "production build", and build-webkit, which is
    8992# used by bots and developers, will disable it, to enable warnings etc.

  • trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf

    r124879 r139570  
    1717contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
    1818
    19 # Make sure we process the PKGCONFIG variable if applicable
    20 !mac: CONFIG += link_pkgconfig
    21 
    2219# Reduce linking memory pressure on 32-bit debug builds on Linux
    2320linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files
Note: See TracChangeset for help on using the changeset viewer.