mirror of https://git.wownero.com/dsc/mxe.git
Merge pull request #1538 from LuaAndC/build-pkg-recommends
build-pkg: system requirements are recommendations not dependencies
This commit is contained in:
commit
f21c7c330d
|
@ -735,10 +735,16 @@ Description: %s
|
||||||
|
|
||||||
local function debianControl(options)
|
local function debianControl(options)
|
||||||
local deb_deps_str = ''
|
local deb_deps_str = ''
|
||||||
if #options.deps >= 1 then
|
if options.deps and #options.deps >= 1 then
|
||||||
deb_deps_str = '\n' .. 'Depends: ' ..
|
deb_deps_str = deb_deps_str ..
|
||||||
|
'\n' .. 'Depends: ' ..
|
||||||
table.concat(options.deps, ', ')
|
table.concat(options.deps, ', ')
|
||||||
end
|
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
|
local version = options.version .. '-' .. TODAY
|
||||||
return CONTROL:format(
|
return CONTROL:format(
|
||||||
options.package,
|
options.package,
|
||||||
|
@ -750,7 +756,7 @@ local function debianControl(options)
|
||||||
)
|
)
|
||||||
end
|
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 '.'
|
dst = dst or '.'
|
||||||
local dirname = ('%s/%s_%s'):format(dst, name,
|
local dirname = ('%s/%s_%s'):format(dst, name,
|
||||||
protectVersion(ver))
|
protectVersion(ver))
|
||||||
|
@ -774,6 +780,7 @@ local function makePackage(name, files, deps, ver, d1, d2, dst)
|
||||||
version = protectVersion(ver),
|
version = protectVersion(ver),
|
||||||
arch = ARCH,
|
arch = ARCH,
|
||||||
deps = deps,
|
deps = deps,
|
||||||
|
recommends = recommends,
|
||||||
description1 = d1,
|
description1 = d1,
|
||||||
description2 = d2,
|
description2 = d2,
|
||||||
}
|
}
|
||||||
|
@ -989,8 +996,10 @@ local function makeMxeRequirementsPackage(release)
|
||||||
os.execute(('mkdir -p %s'):format(release))
|
os.execute(('mkdir -p %s'):format(release))
|
||||||
local name = 'mxe-requirements'
|
local name = 'mxe-requirements'
|
||||||
local ver = getMxeVersion() .. release
|
local ver = getMxeVersion() .. release
|
||||||
-- dependencies
|
-- MXE build requirements should not be strict dependencies here
|
||||||
local deps = {
|
-- See https://github.com/mxe/mxe/issues/1537
|
||||||
|
local deps = {}
|
||||||
|
local recommends = {
|
||||||
'autoconf', 'automake', 'autopoint', 'bash', 'bison',
|
'autoconf', 'automake', 'autopoint', 'bash', 'bison',
|
||||||
'bzip2', 'cmake', 'flex', 'gettext', 'git', 'g++',
|
'bzip2', 'cmake', 'flex', 'gettext', 'git', 'g++',
|
||||||
'gperf', 'intltool', 'libffi-dev', 'libtool',
|
'gperf', 'intltool', 'libffi-dev', 'libtool',
|
||||||
|
@ -1002,7 +1011,7 @@ local function makeMxeRequirementsPackage(release)
|
||||||
}
|
}
|
||||||
if release ~= 'wheezy' then
|
if release ~= 'wheezy' then
|
||||||
-- Jessie+
|
-- Jessie+
|
||||||
table.insert(deps, 'libtool-bin')
|
table.insert(recommends, 'libtool-bin')
|
||||||
end
|
end
|
||||||
local dummy_name = 'mxe-requirements.dummy.' .. release
|
local dummy_name = 'mxe-requirements.dummy.' .. release
|
||||||
local dummy = io.open(dummy_name, 'w')
|
local dummy = io.open(dummy_name, 'w')
|
||||||
|
@ -1011,7 +1020,7 @@ local function makeMxeRequirementsPackage(release)
|
||||||
local d1 = "MXE requirements package"
|
local d1 = "MXE requirements package"
|
||||||
local d2 = MXE_REQUIREMENTS_DESCRIPTION2
|
local d2 = MXE_REQUIREMENTS_DESCRIPTION2
|
||||||
local dst = release
|
local dst = release
|
||||||
makePackage(name, files, deps, ver, d1, d2, dst)
|
makePackage(name, files, deps, ver, d1, d2, dst, recommends)
|
||||||
os.remove(dummy_name)
|
os.remove(dummy_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue