Commit Graph

33 Commits

Author SHA1 Message Date
Tony Theodore c1afdc77ca improve cmake toolchain variable handling and pkg-config detection 2019-04-09 23:29:31 +10:00
Tony Theodore 877f4da8b8 pkgconf: new-style options 2018-03-15 12:28:24 +11:00
Tony Theodore 05be27ff7c cmake-conf pkgconf: fixups for dep ordering 2017-12-23 08:19:00 +11:00
Tony Theodore d5acb5a3ec add libtool dep for native packages using autotools
Partially built autotools suite can cause race condition
when plugins/native is included

fixes #1851
2017-07-25 15:45:00 +10:00
Mark Brand b72e1a3f85 Avoid extra mentions of system library path when linking
Normally pkg-config would remove the system library path from
--libs output. Defining PKG_CONFIG_SYSTEM_LIBRARY_PATH helps
it do so. The extra mentions of system library path in the
linking commands is unsightly but probabaly harmless.
2017-06-16 12:54:27 +02:00
Mark Brand ede738758e qtbase: prevent extra leading / on system include and lib directories
PKG_CONFIG_SYSROOT should not be set because MXE uses fully
qualified paths. However, to  satisfy the Qt build system's
cross-compiling "sanity check", qtbase.mk defines
    PKG_CONFIG_SYSROOT_DIR=/
This causes pkg-config to prefix the system include and library
paths with an extra /. Pkg-config does not strip these prefixed
paths from --cflags and --libs output. The workaround here is
to remove the PKG_CONFIG_SYSROOT_DIR definition in the wrapper
script for pkg-config.
2017-06-16 11:56:32 +02:00
Tony Theodore b2c66b3191 pkgconf: use PKG_CONFIG_SYSTEM_INCLUDE_PATH in wrapper 2017-06-15 21:33:55 +10:00
Viktor Szakats e961e447fb URL updates 2017-03-04 10:33:47 +00:00
Boris Nagaev 74163f1794 add _WEBSITE and _DESCR fields to core packages
See https://github.com/mxe/mxe/issues/1422

Automation (Python 2 code): https://gist.github.com/9f5c315e5d0cf113d41dc454b7a0eb41
2016-12-22 22:25:48 +01:00
Boris Nagaev 6adb5ade12 Copyright headers: point to LICENSE.md and shorten
The following script was applied:

    sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE')

    sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \
        $(git grep -l 'part of MXE.*See index.html')

    before='This file is part of MXE. See index.html for further information.'
    after='This file is part of MXE. See LICENSE.md for licensing information.'
    sed "s/$before/$after/" -i $(git grep -l 'part of MXE')

Then git grep 'index.html for further information' revealed two other files.
One of them was patched manually (patch.mk). Makefile has text
"See index.html for further information" unrelated to licensing.

See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-27 12:31:29 +03:00
Tony Theodore 9732e4dc29 pkgconf yasm: enable native builds and consolidate rules 2015-10-25 12:23:28 +11:00
Christian Frisson 5a81e60e04 pkgconf: added option CACHE PATH for PKG_CONFIG_EXECUTABLE in pkgconf.cmake so that pkgconf can be found through cmake at first run 2015-09-29 14:41:08 +02:00
Tony Theodore fc0ed34fb9 all packages: really use sha256 checksums 2015-09-23 18:32:58 +10:00
Tony Theodore a228c0488f all packages: switch to sha256 checksums
closes #871
2015-09-23 17:27:16 +10:00
Tony Theodore 19d1be38ae Move general configuration from pkgconf to mxe-conf and add cmake/mxe-conf.d 2015-09-12 13:43:04 +10:00
Tony Theodore 3c67cefde7 boost hdf5 pkgconf qt: move cmake variables to respective packages 2014-12-08 20:22:39 +11:00
Timothy Gu 2beb76e10d mxe-conf.cmake: Add Boost_THREADAPI
Closes #560.
2014-11-22 16:38:02 -08:00
Timothy Gu 4a08af93b6 mxe-conf.cmake: Prepend CMAKE_MODULE_PATH instead of overwriting it
Fixes compilation of Armadillo.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-10-20 00:58:05 -04:00
Timothy Gu ec6653705a mxe-conf.cmake: Workaround buggy windres rules
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-10-15 19:56:40 -04:00
Martin Müllenhaupt 3ce38c8138 move CMAKE_MODULE_PATH into toolchain config 2014-10-08 17:58:08 +02:00
Timothy Gu 51db0500d1 pkgconf: work around for buggy FindOpenSSL.cmake
FindOpenSSL.cmake bundled with cmake older than 2.8.12-rc1 uses
CMAKE_CROSS_COMPILING, which is incorrect because the real variable name
is CMAKE_CROSSCOMPILING. Because it is not possible to modify users'
CMake installation, work around it here.

This fixes building libwebsockets on Ubuntu 13.10. (I only tested 14.04
when merging the pull request.)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-09-21 19:32:36 -07:00
Timothy Gu 8b2e5e1bac Fix GitHub update routine
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-08-01 19:41:37 -07:00
Tony Theodore b761bc9bcb package pkgconf: remove symlink to pkg-config and invoke pkgconf directly in wrapper script 2014-04-11 00:45:08 +10:00
Tony Theodore c950f3635c various packages: enable shared builds 2014-02-10 16:33:26 +11:00
Tony Theodore 837ecd6648 Makefile and pkgconf: move external tools separate directory 2014-02-10 02:47:16 +11:00
Tony Theodore 47361fa750 Makefile docs and pkgconf: add support for shared|static variants 2014-02-09 18:34:19 +11:00
Tony Theodore 1a9ad29fe6 mxe configury: build native pkgconf and centralise various conf files
Since we need pkgconf for Cflags.private support, it seems like a
logical place for these types of config files instead of being
spread over Makefile, binutils, and gcc.
2014-02-08 23:23:00 +11:00
Tony Theodore 23da84683a package pkgconf: disable updates 2013-10-20 13:47:49 +11:00
Tony Theodore c50e6911b1 package pkgconf: add automake dependency 2013-09-12 17:22:42 +10:00
Tony Theodore 5b318144b9 native packages: tidy up and install to BUILD prefix to avoid conflicts 2013-08-25 19:12:13 +10:00
Tony Theodore 28843338c4 Revert "update package pkgconf"
This reverts commit 68a73a314c.
2013-08-24 23:38:17 +10:00
Tony Theodore 68a73a314c update package pkgconf 2013-08-24 15:47:09 +10:00
Tony Theodore 9345819595 add package pkgconf (optional native build) 2013-08-21 20:21:03 +10:00