Commit Graph

30 Commits

Author SHA1 Message Date
Tony Theodore e9b65d556a move autoreconf check from mxe-conf to autotools
see: http://lists.nongnu.org/archive/html/mingw-cross-env-list/2018-03/msg00006.html
2018-03-30 16:43:43 +11:00
Tony Theodore cded114ce3 mingw-w64: install gl *.pc files here instead of mxe-conf 2017-12-23 08:19:00 +11:00
Tony Theodore 24d37efa5d cmake: improve configuration with templates
- move cmake configuration from mxe-conf to cmake-conf
 - replace `echo` with templates for readability and maintenance
 - allow packages to set other dep files
 - set CMAKE_POLICY_DEFAULT_CMPNNNN in wrapper since
   `cmake_minimum_required` or `cmake_policy` can't be set in
   toolchain (closes #971)
2017-03-12 17:30:18 +11:00
Viktor Szakats 45d34aaac7 more URL updates 2017-03-10 13:59:00 +00:00
Tony Theodore a23f7ac946 cmake wrapper: disbale package registry
See: https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry

fixes #1585
2017-01-19 20:11:55 +11:00
Boris Nagaev 4ba82ea5df cmake: force some variables in toolchain file
See https://github.com/mxe/mxe/pull/1621#issuecomment-270176619
2017-01-08 03:01:54 +01:00
Boris Nagaev 1e9ba61b55 add vars BUILD_{STATIC,SHARED}[_LIBS] to cmake
Only BUILD_SHARED_LIBS was there before.
2017-01-08 03:01:54 +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 e66f2a9e9d cmake: fix windres invocation
Windres doesn't recognise various gcc flags like `-mms-bitfields`,
`-fopenmp`, `-mthreads` etc. (basically anything not `-D` or `-I`).

CMake will filter options if `add_compile_options()` is used, but not
for `add_definitions()`. The developers class it as a "won't fix" as
they believe `add_definitions()` shouldn't be used for such flags.

Fixes #1475
2016-08-12 02:19:40 +10:00
Boris Nagaev aab2b70253 create tmp-*/readonly instead of usr/readonly
Removing MXE directory with "rm -rf" used to fail on file
usr/readonly/.gitkeep because directory usr/readonly was readonly.
Now readonly directory is created in tmp-* directory and .gitkeep
is not created for it (because tmp-* is not under usr/).
Problems with removing MXE directory are fixed even in case
of interrupted build.

fix #1221
2016-06-12 02:08:38 +03:00
Boris Nagaev d75a5607a3 mxe-conf: prevent touching a file in readonly dir
fix #1199
2016-01-26 00:41:15 +03:00
Tony Theodore 5dffb8ffe1 mxe-conf: fix for touchin readonly directory 2016-01-21 17:43:01 +11:00
Tony Theodore dfec326366 Makefile and mxe-conf: create basic non-empty directory hierarchy
https://github.com/mxe/mxe/pull/1061/files#r49049496
https://github.com/mxe/mxe/issues/1111#issuecomment-169280181
2016-01-12 15:17:21 +11:00
Boris Nagaev 01dc8941ec mxe-conf: create .gitkeep in CMAKE_TOOLCHAIN_DIR
It is needed for build-pkg and #1111, Git doesn't see empty directories.
2016-01-12 15:16:03 +11:00
Tony Theodore 768c11246e cmake wrapper: use common TryRunResults.cmake 2015-12-01 20:31:10 +11:00
Tony Theodore 9bd2349eeb Build native version of cmake
* install in MXE native path so only visible to MXE sessions and wrapper scripts
* remove from requirements
* no MXE patches or pkg updates yet
2015-11-27 14:11:14 +11:00
Boris Nagaev f499671318 mxe-conf: create always failing wine dummy
Now dlfcn-win32 can't detect wine.
From log/dlfcn-win32_i686-w64-mingw32.static:

    static: yes
    shared: no
    wine:

Previously wine was set to "yes wine".

fix #995
2015-11-15 19:07:38 +03:00
Boris Nagaev 047efe0f21 mxe-conf: create readonly dir in _BUILD_$(BUILD)
This directory (WINEPREFIX=$(PREFIX)/readonly) is not
target specific. It is created once instead of being
created for each target.
2015-11-15 19:05:18 +03:00
Boris Nagaev fa46375662 [style] remove empty line between related commands 2015-11-15 19:04:11 +03:00
Tony Theodore ba7c553c66 mxe-conf: add CMAKE_PREFIX_PATH to toolchain file
see #904
2015-10-27 20:59:44 +11:00
Tony Theodore 870e439d0f mxe-conf: consolidate rules and install cmake modules under usr 2015-10-25 12:23:28 +11:00
Boris Nagaev 0ef2cb3b40 cmake: no -DCMAKE_TOOLCHAIN_FILE with some options
CMake with a toolchain file doesn't work properly in some modes.

  * --build
  * --system-information
  * -E

close #932
2015-10-16 00:43:39 +03:00
Tony Theodore 2bc137d4f6 cmake modules: use less warning-like status messages 2015-10-04 16:15:50 +11:00
Tony Theodore a0ae512424 move cmake modules to src/cmake/modules 2015-10-03 16:32:00 +10:00
Tony Theodore 8e2d0e85c5 set WINEPREFIX to a readonly directory to force wine to fail
fixes #841
2015-09-30 14:57:37 +10:00
Tony Theodore 989f09ca99 mxe-conf: basic sanity checking of autotools
in the spirit of ./configure, detect capabilities instead of versions
2015-09-13 23:08:31 +10:00
Tony Theodore ac470ea0da mxe-conf: add note about ac_cv_build 2015-09-12 15:35:08 +10:00
Tony Theodore 93eaa16fae mxe-conf: create prefixed cmake wrapper script 2015-09-12 13:43:05 +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 4d858c468b Makefile: include mxe-conf as an order-only dep of all packages
Order-only deps have the benefit of guaranteed early execution and not requiring full rebuilds. It isn't a real package, so we don't want an entry in index.html.
2015-09-12 13:43:04 +10:00