github/amigaos-cross-toolchain6
2
0
Fork 0
mirror of https://frontier.innolan.net/github/amigaos-cross-toolchain6.git synced 2024-10-19 10:29:55 +00:00
Code Releases Activity

@R support number of threads via parameter --threads=<n>, @I added eclipse projet files

Browse Source
This commit is contained in:
bebbo
2017-01-31 20:53:22 +01:00
parent 90a3cb6dbf
commit 1c1b2b1014
4 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.project
View File

@ -5,7 +5,13 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.python.pydev.pythonNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

5
.pydevproject Executable file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</pydev_project>

4
common.py
View File

@ -454,11 +454,11 @@ def configure(name, *confopts, **kwargs):
@recipe('make', 2) @recipe('make', 2)
def make(name, target=None, makefile=None, **makevars): def make(name, target=None, makefile=None, threads='-j1', **makevars):
info('running make "%s"', target) info('running make "%s"', target)
with cwd(path.join('{build}', name)): with cwd(path.join('{build}', name)):
args = ['%s=%s' % item for item in makevars.items()] + ["-j7"] args = ['%s=%s' % item for item in makevars.items()] + [threads]
if target is not None: if target is not None:
args = [target] + args args = [target] + args
if makefile is not None: if makefile is not None:

77
toolchain-m68k
View File

@ -88,7 +88,7 @@ def install_ndk():
def headers_install(): def headers_install():
info('installing ixemul header files') info('installing ixemul header files')
copytree('{sources}/{ixemul}/include', '{target}/m68k-amigaos/libnix/include') copytree('{sources}/{ixemul}/include', '{target}/m68k-amigaos/include')
@recipe('tools-install') @recipe('tools-install')
@ -103,7 +103,7 @@ def install_tools():
def install_libamiga(): def install_libamiga():
info('installing libamiga') info('installing libamiga')
copytree('{sources}/{libamiga}/lib', '{target}/m68k-amigaos/libnix/lib') copytree('{sources}/{libamiga}/lib', '{target}/m68k-amigaos/lib')
@recipe('{clib2}-install') @recipe('{clib2}-install')
@ -290,14 +290,14 @@ def build():
unpack('{m4}') unpack('{m4}')
configure('{m4}', '--prefix={host}') configure('{m4}', '--prefix={host}')
make('{m4}') make('{m4}', threads='-j{numThreads}')
make('{m4}', 'install') make('{m4}', 'install', 'Makefile', threads='-j{numThreads}')
unpack('{gawk}') unpack('{gawk}')
update_autotools('{sources}/{gawk}') update_autotools('{sources}/{gawk}')
configure('{gawk}', '--prefix={host}') configure('{gawk}', '--prefix={host}')
make('{gawk}') make('{gawk}', threads='-j{numThreads}')
make('{gawk}', 'install') make('{gawk}', 'install', threads='-j{numThreads}')
unpack('{flex}') unpack('{flex}')
configure('{flex}', '--prefix={host}') configure('{flex}', '--prefix={host}')
@ -307,25 +307,25 @@ def build():
unpack('{bison}') unpack('{bison}')
update_autotools('{sources}/{bison}/config') update_autotools('{sources}/{bison}/config')
configure('{bison}', '--prefix={host}') configure('{bison}', '--prefix={host}')
make('{bison}') make('{bison}', threads='-j{numThreads}')
make('{bison}', 'install') make('{bison}', 'install', threads='-j{numThreads}')
unpack('{texinfo}') unpack('{texinfo}')
update_autotools('{sources}/{texinfo}/build-aux') update_autotools('{sources}/{texinfo}/build-aux')
configure('{texinfo}', '--prefix={host}') configure('{texinfo}', '--prefix={host}')
make('{texinfo}') make('{texinfo}', threads='-j{numThreads}')
make('{texinfo}', 'install') make('{texinfo}', 'install', threads='-j{numThreads}')
unpack('{autoconf}') unpack('{autoconf}')
update_autotools('{sources}/{autoconf}') update_autotools('{sources}/{autoconf}')
configure('{autoconf}', '--prefix={host}') configure('{autoconf}', '--prefix={host}')
make('{autoconf}') make('{autoconf}', threads='-j{numThreads}')
make('{autoconf}', 'install') make('{autoconf}', 'install', threads='-j{numThreads}')
prepare_target() prepare_target()
unpack('vasm', work_dir='{build}') unpack('vasm', work_dir='{build}')
make('vasm', CPU='m68k', SYNTAX='mot') make('vasm', CPU='m68k', SYNTAX='mot', threads='-j{numThreads}')
unpack('vlink', work_dir='{build}') unpack('vlink', work_dir='{build}')
build_vlink() build_vlink()
@ -341,14 +341,14 @@ def build():
update_autotools('{submodules}/fd2sfd') update_autotools('{submodules}/fd2sfd')
unpack('fd2sfd', work_dir='{build}') unpack('fd2sfd', work_dir='{build}')
configure('fd2sfd', '--prefix={target}', from_dir='{build}/fd2sfd') configure('fd2sfd', '--prefix={target}', from_dir='{build}/fd2sfd')
make('fd2sfd') make('fd2sfd', threads='-j{numThreads}')
make('fd2sfd', 'install') make('fd2sfd', 'install', threads='-j{numThreads}')
update_autotools('{submodules}/sfdc') update_autotools('{submodules}/sfdc')
unpack('sfdc') unpack('sfdc')
configure('sfdc', '--prefix={target}', copy_source=True) configure('sfdc', '--prefix={target}', copy_source=True)
make('sfdc') make('sfdc', threads='-j{numThreads}')
make('sfdc', 'install') make('sfdc', 'install', threads='-j{numThreads}')
unpack('{NDK}') unpack('{NDK}')
patch('{NDK}') patch('{NDK}')
@ -378,8 +378,8 @@ def build():
'--target=m68k-amigaos', '--target=m68k-amigaos',
from_dir='{submodules}/{binutils}') from_dir='{submodules}/{binutils}')
touch_genfiles('{submodules}/{binutils}') touch_genfiles('{submodules}/{binutils}')
make('{binutils}') make('{binutils}', threads='-j{numThreads}')
make('{binutils}', 'install') make('{binutils}', 'install', threads='-j{numThreads}')
unpack('{ixemul}', top_dir='ixemul') unpack('{ixemul}', top_dir='ixemul')
patch('{ixemul}') patch('{ixemul}')
@ -395,9 +395,9 @@ def build():
'--with-headers={sources}/{ixemul}/include', '--with-headers={sources}/{ixemul}/include',
from_dir='{submodules}/{gcc}') from_dir='{submodules}/{gcc}')
touch_genfiles('{submodules}/{gcc}') touch_genfiles('{submodules}/{gcc}')
make('{gcc}', 'all-gcc', make('{gcc}', 'all-gcc', threads='-j{numThreads}',
MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
make('{gcc}', 'install-gcc', make('{gcc}', 'install-gcc', threads='-j{numThreads}',
MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
headers_install() headers_install()
@ -406,7 +406,7 @@ def build():
install_libamiga() install_libamiga()
configure('{libnix}', configure('{libnix}',
'--prefix={target}/m68k-amigaos/libnix', '--prefix={target}/m68k-amigaos',
'--host=i686-linux-gnu', '--host=i686-linux-gnu',
'--target=m68k-amigaos', '--target=m68k-amigaos',
from_dir='{submodules}/{libnix}') from_dir='{submodules}/{libnix}')
@ -416,11 +416,11 @@ def build():
AR='m68k-amigaos-ar', AR='m68k-amigaos-ar',
AS='m68k-amigaos-as', AS='m68k-amigaos-as',
RANLIB='m68k-amigaos-ranlib', RANLIB='m68k-amigaos-ranlib',
LD='m68k-amigaos-ld') LD='m68k-amigaos-ld', threads='-j{numThreads}')
make('{libnix}', 'install') make('{libnix}', 'install', threads='-j{numThreads}')
copy('{submodules}/{libnix}/sources/headers/stabs.h', copy('{submodules}/{libnix}/sources/headers/stabs.h',
'{target}/m68k-amigaos/libnix/include') '{target}/m68k-amigaos/include')
unpack('{libm}', top_dir='contrib/libm') unpack('{libm}', top_dir='contrib/libm')
update_autotools('{sources}/{libm}') update_autotools('{sources}/{libm}')
@ -428,21 +428,21 @@ def build():
AR='m68k-amigaos-ar', AR='m68k-amigaos-ar',
RANLIB='m68k-amigaos-ranlib'): RANLIB='m68k-amigaos-ranlib'):
configure('{libm}', configure('{libm}',
'--prefix={target}/m68k-amigaos/libnix', '--prefix={target}/m68k-amigaos/lib',
'--host=i686-linux-gnu', '--host=i686-linux-gnu',
'--target=m68k-amigaos') '--target=m68k-amigaos')
make('{libm}') make('{libm}', threads='-j{numThreads}')
make('{libm}', 'install') make('{libm}', 'install', threads='-j{numThreads}')
with env(CC='m68k-amigaos-gcc -noixemul', with env(CC='m68k-amigaos-gcc -noixemul',
AR='m68k-amigaos-ar', AR='m68k-amigaos-ar',
RANLIB='m68k-amigaos-ranlib'): RANLIB='m68k-amigaos-ranlib'):
configure('{libdebug}', configure('{libdebug}',
'--prefix={target}/m68k-amigaos/libnix', '--prefix={target}/m68k-amigaos',
'--host=m68k-amigaos', '--host=m68k-amigaos',
from_dir='{submodules}/{libdebug}') from_dir='{submodules}/{libdebug}')
make('{libdebug}') make('{libdebug}', threads='-j{numThreads}')
make('{libdebug}', 'install') make('{libdebug}', 'install', threads='-j{numThreads}')
unpack('{clib2}', work_dir='{build}', top_dir='library') unpack('{clib2}', work_dir='{build}', top_dir='library')
make('{clib2}', makefile='GNUmakefile.68k') make('{clib2}', makefile='GNUmakefile.68k')
@ -510,8 +510,8 @@ def add_stubs(src):
obj = re.sub(r'\.c$', r'.o', src) obj = re.sub(r'\.c$', r'.o', src)
for libdir, cflags in MULTILIB: for libdir, cflags in MULTILIB:
lib = path.join('{target}/m68k-amigaos/libnix/lib', lib = path.join('{target}/m68k-amigaos/lib',
libdir, 'libnix/libstubs.a') libdir, 'libstubs.a')
info('stubs: "%s" -> "%s"', obj, lib) info('stubs: "%s" -> "%s"', obj, lib)
cflags = list(cflags) + ['-noixemul', '-c', '-o', obj, src] cflags = list(cflags) + ['-noixemul', '-c', '-o', obj, src]
execute('m68k-amigaos-gcc', '-Wall', '-O3', '-fomit-frame-pointer', *cflags) execute('m68k-amigaos-gcc', '-Wall', '-O3', '-fomit-frame-pointer', *cflags)
@ -523,7 +523,7 @@ def add_lib(src, libname):
obj = re.sub(r'\.a$', r'.o', libname) obj = re.sub(r'\.a$', r'.o', libname)
for libdir, cflags in MULTILIB: for libdir, cflags in MULTILIB:
lib = path.join('{target}/m68k-amigaos/libnix/lib', libdir, libname) lib = path.join('{target}/m68k-amigaos/lib', libdir, libname)
info('lib: "%s" -> "%s"', obj, lib) info('lib: "%s" -> "%s"', obj, lib)
cflags = list(cflags) + ['-noixemul', '-c', '-o', obj, src] cflags = list(cflags) + ['-noixemul', '-c', '-o', obj, src]
execute('m68k-amigaos-gcc', '-Wall', '-O3', '-fomit-frame-pointer', *cflags) execute('m68k-amigaos-gcc', '-Wall', '-O3', '-fomit-frame-pointer', *cflags)
@ -662,17 +662,20 @@ if __name__ == "__main__":
default='build', help='perform action') default='build', help='perform action')
parser.add_argument('args', metavar='ARGS', type=str, nargs='*', parser.add_argument('args', metavar='ARGS', type=str, nargs='*',
help='action arguments') help='action arguments')
parser.add_argument('--binutils', choices=['2.9.1', '2.14'], default='2.9.1', parser.add_argument('--binutils', choices=['2.9.1', '2.14'], default='2.14',
help='desired binutils version') help='desired binutils version')
parser.add_argument('--gcc', choices=['2.95.3', '3.4.6', '6'], default='2.95.3', parser.add_argument('--gcc', choices=['2.95.3', '3.4.6', '6'], default='6',
help='desired gcc version') help='desired gcc version')
parser.add_argument('--prefix', type=str, default=None, parser.add_argument('--prefix', type=str, default=None,
help='installation directory') help='installation directory')
parser.add_argument('--threads', type=str, default='1',
help='number of threads for make')
args = parser.parse_args() args = parser.parse_args()
setvar(top=path.abspath(path.dirname(sys.argv[0])), setvar(top=path.abspath(path.dirname(sys.argv[0])),
binutils_ver=args.binutils, binutils_ver=args.binutils,
gcc_ver=args.gcc) gcc_ver=args.gcc,
numThreads=args.threads)
setvar(m4='m4-1.4.17', setvar(m4='m4-1.4.17',
gawk='gawk-3.1.8', gawk='gawk-3.1.8',