diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2016-10-12 01:11:40 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2016-10-12 01:11:40 (GMT) |
commit | 846b981165e6ce86e55d902ffb6adab8e5c96e5a (patch) | |
tree | 73fb992ccd40a24f7af92e7b790022fdad3a942d /tools | |
parent | 6164a71b971c7b9b301a65347b47bc21709003a6 (diff) | |
download | mxe-846b981165e6ce86e55d902ffb6adab8e5c96e5a.zip mxe-846b981165e6ce86e55d902ffb6adab8e5c96e5a.tar.gz mxe-846b981165e6ce86e55d902ffb6adab8e5c96e5a.tar.bz2 |
build-pkg: system requirements are recommendations
... not dependencies.
fix #1537
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/build-pkg.lua | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 1f12146..dbc39b3 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -735,10 +735,16 @@ Description: %s local function debianControl(options) local deb_deps_str = '' - if #options.deps >= 1 then - deb_deps_str = '\n' .. 'Depends: ' .. + if options.deps and #options.deps >= 1 then + deb_deps_str = deb_deps_str .. + '\n' .. 'Depends: ' .. table.concat(options.deps, ', ') end + if options.recommends and #options.recommends >= 1 then + deb_deps_str = deb_deps_str .. + '\n' .. 'Recommends: ' .. + table.concat(options.recommends, ', ') + end local version = options.version .. '-' .. TODAY return CONTROL:format( options.package, @@ -750,7 +756,7 @@ local function debianControl(options) ) end -local function makePackage(name, files, deps, ver, d1, d2, dst) +local function makePackage(name, files, deps, ver, d1, d2, dst, recommends) dst = dst or '.' local dirname = ('%s/%s_%s'):format(dst, name, protectVersion(ver)) @@ -774,6 +780,7 @@ local function makePackage(name, files, deps, ver, d1, d2, dst) version = protectVersion(ver), arch = ARCH, deps = deps, + recommends = recommends, description1 = d1, description2 = d2, } @@ -989,8 +996,10 @@ local function makeMxeRequirementsPackage(release) os.execute(('mkdir -p %s'):format(release)) local name = 'mxe-requirements' local ver = getMxeVersion() .. release - -- dependencies - local deps = { + -- MXE build requirements should not be strict dependencies here + -- See https://github.com/mxe/mxe/issues/1537 + local deps = {} + local recommends = { 'autoconf', 'automake', 'autopoint', 'bash', 'bison', 'bzip2', 'cmake', 'flex', 'gettext', 'git', 'g++', 'gperf', 'intltool', 'libffi-dev', 'libtool', @@ -1002,7 +1011,7 @@ local function makeMxeRequirementsPackage(release) } if release ~= 'wheezy' then -- Jessie+ - table.insert(deps, 'libtool-bin') + table.insert(recommends, 'libtool-bin') end local dummy_name = 'mxe-requirements.dummy.' .. release local dummy = io.open(dummy_name, 'w') @@ -1011,7 +1020,7 @@ local function makeMxeRequirementsPackage(release) local d1 = "MXE requirements package" local d2 = MXE_REQUIREMENTS_DESCRIPTION2 local dst = release - makePackage(name, files, deps, ver, d1, d2, dst) + makePackage(name, files, deps, ver, d1, d2, dst, recommends) os.remove(dummy_name) end |