packages built by build-pkg.lua work on Wheezy

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
This commit is contained in:
Boris Nagaev 2015-07-06 23:31:33 +03:00
parent 689d0222db
commit ab0f773a7e
1 changed files with 11 additions and 7 deletions

View File

@ -11,8 +11,6 @@
-- Packages are written to `*.tar.xz` files.
-- Debian packages are written to `*.deb` files.
-- You also need Debian Jessie or later to install these packages
local max_packages = tonumber(os.getenv('MXE_MAX_PACKAGES'))
local MXE_DIR = '/usr/lib/mxe'
@ -314,7 +312,7 @@ Description: MXE requirements package
Other MXE packages depend on this package.
]]
local function makeMxeRequirementsDeb(arch)
local function makeMxeRequirementsDeb(arch, release)
local name = 'mxe-requirements'
local ver = getMxeVersion()
-- dependencies
@ -322,7 +320,6 @@ local function makeMxeRequirementsDeb(arch)
'autoconf', 'automake', 'autopoint', 'bash', 'bison',
'bzip2', 'cmake', 'flex', 'gettext', 'git', 'g++',
'gperf', 'intltool', 'libffi-dev', 'libtool',
'libtool-bin',
'libltdl-dev', 'libssl-dev', 'libxml-parser-perl',
'make', 'openssl', 'patch', 'perl', 'p7zip-full',
'pkg-config', 'python', 'ruby', 'scons', 'sed',
@ -332,9 +329,14 @@ local function makeMxeRequirementsDeb(arch)
table.insert(deps, 'g++-multilib')
table.insert(deps, 'libc6-dev-i386')
end
if release ~= 'wheezy' then
-- Jessie+
table.insert(deps, 'libtool-bin')
end
local deps_str = table.concat(deps, ', ')
-- directory
local dirname = ('%s_%s_%s'):format(name, ver, arch)
local DIRNAME = '%s/%s_%s_%s'
local dirname = DIRNAME:format(release, name, ver, arch)
-- make DEBIAN/control file
os.execute(('mkdir -p %s/DEBIAN'):format(dirname))
local control_fname = dirname .. '/DEBIAN/control'
@ -355,5 +357,7 @@ buildForTarget('i686-w64-mingw32.static')
buildForTarget('x86_64-w64-mingw32.static')
buildForTarget('i686-w64-mingw32.shared')
buildForTarget('x86_64-w64-mingw32.shared')
makeMxeRequirementsDeb('i386')
makeMxeRequirementsDeb('amd64')
makeMxeRequirementsDeb('i386', 'wheezy')
makeMxeRequirementsDeb('i386', 'jessie')
makeMxeRequirementsDeb('amd64', 'wheezy')
makeMxeRequirementsDeb('amd64', 'jessie')