summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2017-09-24 14:41:44 (GMT)
committerGitHub <noreply@github.com>2017-09-24 14:41:44 (GMT)
commiteebfc1725c32c9c1c0468dae58ab3beb04baffd2 (patch)
tree189c9c3fc9432cd58003c555cb0ab0436fc65cff
parent762b015a514a8aac3b765fce48d0a829580ab179 (diff)
parentdf1ed2b3390ff9793d6cfc48a552eac99b0f43a9 (diff)
downloadmxe-eebfc1725c32c9c1c0468dae58ab3beb04baffd2.zip
mxe-eebfc1725c32c9c1c0468dae58ab3beb04baffd2.tar.gz
mxe-eebfc1725c32c9c1c0468dae58ab3beb04baffd2.tar.bz2
Merge pull request #1905 from LuaAndC/build-pkg-nonetwork
build-pkg: ignore all copies of nonetwork.so
-rwxr-xr-xtools/build-pkg.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua
index e898727..23efab7 100755
--- a/tools/build-pkg.lua
+++ b/tools/build-pkg.lua
@@ -59,9 +59,12 @@ local BLACKLIST = {
'^usr/share/man/',
'^usr/share/gcc',
'^usr/share/gtk-doc',
- '^usr/lib/nonetwork.so',
'^usr/[^/]+/share/doc/',
'^usr/[^/]+/share/info/',
+
+ -- usr/lib/nonetwork.so and
+ -- usr/x86_64-unknown-linux-gnu/lib/nonetwork.so
+ 'lib/nonetwork.so',
}
local TARGETS = {