`git merge -s recursive -X ours` turned out to fail on binary
files. (I can't reproduce this behaviour in test repo, maybe
it is Git's bug.) So I switched to `checkout --ours`, which
worked in that case.
Result of build by previous commit:
https://gist.github.com/32309209c467853deedc
If a conflict happens, build-pkg should "resolve" it by selecting
one of versions. Git has a merge strategy "recursive" with an
option "ours" which does exactly what is needed but works only
for two heads. That is why multi-merge was replaced by multiple
merges of two heads.
check-requirements creates directories usr/<target> for all
targets. By default, MXE_TARGETS=i686-w64-mingw32.static, so
it creates a directory for i686-w64-mingw32.static only.
(Currently this doesn't affect history in usr/.git as git ignores
empty directories.)
* remove `build-only*` - too low level for general use
* add new patch related commands and catch-all completions
* `mxe-make` alias is more descriptive
The installation failed with the following note:
> Noting disappearance of mxe-requirements,
> which has been completely replaced.
Add an empty file mxe-requirements.dummy.$release
to prevent this.
Previously patch-tool-mxe produced the following diffs:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0000000..0000000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
patch tool refused to apply this patch:
The next patch would create the file CMakeLists.txt,
which already exists! Assume -R? [n]
This commit replaces 0000000..0000000 with 1111111..2222222.
Debian packages with "Depends: " do not work:
> Reading package lists... Error!
> E: Problem parsing dependency Depends
> E: Error occurred while processing mxe-source (NewVersion2)
> E: Problem with MergeList /var/lib/apt/lists/pkg.mxe.cc_repos_apt_debian_dists_wheezy_main_binary-amd64_Packages
> E: The package lists or status file could not be parsed or opened.
gcc (and maybe other packages) has both $(PKG)_FILE and
$(PKG)_FILE_$(BUILD). Previously the following error occurred:
$ ./tools/patch-tool-mxe init gcc
./tools/patch-tool-mxe: line 57: [: too many arguments
see #983
There are 20 huge packages like gcc that are compiled for a half
of the build time. The time left expected by the progess printer
changes dramatically after building a huge package. Information
about huge packages smoothes the changes.
Example: "4_1_3" -> "4.1.3-20151028".
Adding build-unique (making two builds in one day is unlikely)
Debian patch version tells APT that the package was updated.
Underscores in versions were previously replaced with dashes.
Example: 4_1_3 -> 4-1-3 (package winpcap).
"-3" is interpreted as Debian patch version, which is wrong.
Move common code (making a directory, control file, running tar,
dpkg-deb, etc) to function makePackage(). This function is used
by functions makeDeb() and makeMxeRequirementsDeb().
"make target~pkg" doesn't work if target is not in
MXE_TARGETS. I believe such behaviout to be a feature
not a bug, because it seems to work faster with lesser
MXE_TARGETS.
str:match(pattern) treats pattern as a regular expression.
str:find(substring, 1, true) searches for a substring.
The latter is needed to check if a filename contains a target.
1. Remove common packages.
Common packages served a replacement for native target.
Now we have native target and don't need common packages.
Existing common files (ncurses) have to be fixed.
2. Package -> Item.
Item means a string "target~package".
All functions which used packages now use items.
3. One build list instead of 4 build lists.
All items are sorted and built together without separation
by target.
4. No module-global variable "target".
All functions using target now get "item" and target is
extracted from item. All remaining module-global variables
don't change (are constants) or are created in the bottom
of the module.
5. MXE_MAX_PACKAGES -> MXE_MAX_ITEMS
see #925
see #919
File ownership is set as string "root/root" in Debian files. So numeric
owners are converted to strings anyway. On FreeBSD numeric group "0" is
converted to "wheel" instead of "root".
see #901
I faced with the problem after running build-pkg on this machine
many-many times. Finally I found this method how to fix it without
restarting the machine.
Option --brief tells "file" not to prepend filenames
to output lines. Using this option is better than parsing
standard format of output of "file" with a regular expression.
Some filenames contain ":". This confuses the regular
expression:
[build-pkg] i686-w64-mingw32.static
Can't get type of file usr/i686-w64-mingw32.static/share/
gtk-doc/html/libgda-4.0/gen:sql_identifiers.html (libgda).
file says "usr/i686-w64-mingw32.static/share/gtk-doc/html/
libgda-4.0/gen:sql_identifiers.html:
HTML document, ASCII text"
Example: usr/i686-w64-mingw32.static/bin/luajit
This file must have '.exe' in name, but build-pkg
doesn't catch this error, because it's type was
"symbolic link to luajit-2.0.4".
With option --dereference, "file" follows symlinks.
For usr/i686-w64-mingw32.static/bin/luajit it returns
"PE32 executable (console) Intel 80386 (stripped to external
PDB), for MS Windows".
mxe-requirements package doesn't install any files
therefore fakeroot is not required. Because no files
were created with fakeroot, database file `deb.fakeroot'
did not exist.
close#840
To prevent build-pkg from creating deb packages,
set environment variable MXE_NO_DEBS to 1
In this case fakeroot and dpkg-deb are not needed.
Add a comment about MXE_MAX_PACKAGES.
* PE32 files without .exe or .dll
* .exe or .dll files which are not in PE32 format
* files with other target in name
* changed files
* file belongs to the same target -- add a dependency
* otherwise: log this message with label 'error'
close#822
2.23 -> 2.23jessie | 2.23wheezy
Package mxe-requirements has different dependencies for
Wheezy and Jessie. APT server reprepro doesn't allow to
add two different packages with same name and version.
Bad behaviour prior to this commit:
1. The package is broken: pango
2. Package sdl_pango depends on broken pango
3. When t4k_common (which depends on sdl_pango) is built,
pango is tried to build again.
This issue was caused by the error fixed in this commit:
if a package A depends on a broken package B,
then the package A is also BROKEN.
So if a package C depends on package A, then all of them
are broken:
(*)B <- A <- C
B is not "rebuilt" for C.
Previous code just checked if any new file was created.
New code checks existance of the file created by MXE in case
a build succeeded: "usr/<target>/installed/<package>".
Without this improvement, some packages (e.g., pango) were
falsely reported to be built successfully, because they have
two or more targets and only first target succeded, creating
*some* files (but not file "usr/<target>/installed/<package>").
There are documentation and other shared files installed,
which we don't need [1]. Some packages install files to same
paths. There is a list of all packages which overlap and
shared files [2].
Create a list of packages which have common files across
targets. Some of them are a part of compiler chain (gcc-*),
some are built natively intentionally:
* gcc-isl
* gcc-mpc
* gcc-gmp
* gcc-mpfr
* gcc
* yasm
* ncurses
* pkgconf
[1] https://lists.nongnu.org/archive/html/mingw-cross-env-list/2015-06/msg00011.html
[2] https://gist.github.com/starius/59625347cd68a21d9cc9close#763close#757
After commit b14c1a3a9c , packages could not
be installed on Debian <= Wheezy, because it lacks package
libtool-bin. So package mxe-requirements should depend on
libtool-bin only for Debian >= Jessie.
This commit changes the function that builds packages
mxe-requirements. Now it makes 4 .deb files:
wheezy/
mxe-requirements_2.23_i386.deb
mxe-requirements_2.23_amd64.deb
jessie/
mxe-requirements_2.23_i386.deb
mxe-requirements_2.23_amd64.deb
see #754
root
Boris Nagaev
Tony Theodore
Timothy Gu
Volker Grabsch
Martin Müllenhaupt