diff --git a/g/glibc/glibc-2.19-x32.eb b/g/glibc/glibc-2.19-x32.eb index ef2d1ca8..9a1829d1 100644 --- a/g/glibc/glibc-2.19-x32.eb +++ b/g/glibc/glibc-2.19-x32.eb @@ -3,7 +3,7 @@ easyblock = 'ConfigureMake' name = 'glibc' -version = '2.19' +version = '2.17' versionsuffix = '-x32' homepage = 'https://www.gnu.org/software/libc/' @@ -11,7 +11,9 @@ description = """The Glibc package contains the main C library. This library pro toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'} -multilib = True +builddependencies = [ + ('make', '3.82', '', True) +] sources = ['%(name)s-%(version)s.tar.gz'] source_urls = ['http://ftp.gnu.org/gnu/glibc/'] @@ -19,7 +21,7 @@ source_urls = ['http://ftp.gnu.org/gnu/glibc/'] preconfigopts = 'mkdir build && ' preconfigopts += 'cd build && ' configure_cmd_prefix = '.' -configopts = '--enable-kernel=2.6.32 --enable-obsolete-rpc --enable-stack-protector=strong' +configopts = '--enable-kernel=2.6.32 --enable-obsolete-rpc --enable-stack-protector=strong CC="gcc -m32" CXX="g++ -m32" CFLAGS="-O2 -march=i686" CXXFLAGS="-O2 -march=i686" i686-linux-gnu' prebuildopts = 'cd build && ' preinstallopts= 'cd build && ' diff --git a/g/glibc/libc-2.14-6.3.0.eb b/g/glibc/libc-2.14-6.3.0.eb deleted file mode 100644 index 39666f33..00000000 --- a/g/glibc/libc-2.14-6.3.0.eb +++ /dev/null @@ -1,16 +0,0 @@ -easyblock = 'Toolchain' - -name = 'libc' -version = '2.14-6.3.0' - -homepage = 'https://www.gnu.org/software/libc/' -description = """The Glibc package contains the main C library. This library provides the basic routines for allocating memory, searching directories, opening and closing files, reading and writing files, string handling, pattern matching, arithmetic, and so on.""" - -toolchain = {'name': 'dummy', 'version': ''} - -dependencies = [ - ('GCCcore', '6.3.0'), - ('glibc', '2.14') -] - -moduleclass = 'toolchain'