summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2017-09-24 16:01:04 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2017-09-24 16:01:04 (GMT)
commit74e2d77090b516d408dbe7653c4ba93a8ce99e84 (patch)
tree018cfdaecf3d12e417a7b3af5664ebd8a400164d
parent9971cb923a799a68635661ff1308fb8098c88ba1 (diff)
downloadmxe-74e2d77090b516d408dbe7653c4ba93a8ce99e84.zip
mxe-74e2d77090b516d408dbe7653c4ba93a8ce99e84.tar.gz
mxe-74e2d77090b516d408dbe7653c4ba93a8ce99e84.tar.bz2
build-pkg: blacklist {installed,lib}/.gitkeep
The following files are installed by both cmake-conf and mxe-conf: usr/i686-w64-mingw32.shared/installed/.gitkeep usr/i686-w64-mingw32.static/installed/.gitkeep usr/x86_64-unknown-linux-gnu/installed/.gitkeep usr/x86_64-unknown-linux-gnu/lib/.gitkeep usr/x86_64-w64-mingw32.shared/installed/.gitkeep usr/x86_64-w64-mingw32.static/installed/.gitkeep In all cases a package installs other files to the same library, so these .gitkeep files can be safely added to the blacklist. See https://github.com/mxe/mxe/issues/1886#issuecomment-331719282
-rwxr-xr-xtools/build-pkg.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua
index 6b4058e..3aaa08a 100755
--- a/tools/build-pkg.lua
+++ b/tools/build-pkg.lua
@@ -65,6 +65,10 @@ local BLACKLIST = {
-- usr/lib/nonetwork.so and
-- usr/x86_64-unknown-linux-gnu/lib/nonetwork.so
'lib/nonetwork.so',
+
+ -- https://github.com/mxe/mxe/issues/1886#issuecomment-331719282
+ 'installed/.gitkeep',
+ 'lib/.gitkeep',
}
local TARGETS = {