summaryrefslogtreecommitdiff
path: root/etc/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'etc/pkgs')
-rwxr-xr-xetc/pkgs/000-base.sh27
-rwxr-xr-x[-rw-r--r--]etc/pkgs/000-dummy.sh0
-rwxr-xr-xetc/pkgs/001-gcc.sh9
-rwxr-xr-xetc/pkgs/002-binutils.sh18
-rwxr-xr-xetc/pkgs/003-openssl.sh (renamed from etc/pkgs/003-openssh.sh)2
5 files changed, 22 insertions, 34 deletions
diff --git a/etc/pkgs/000-base.sh b/etc/pkgs/000-base.sh
deleted file mode 100755
index e32bbae..0000000
--- a/etc/pkgs/000-base.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-packages=(
- gcc
- gcc-c++
- gcc-gfortran
- git
- glibc
- libuuid-devel
- make
- perl
- pkgconfig
- expat-devel
- bzip2-devel
- gdbm-devel
- libffi-devel
- ncurses-devel
- openssl-devel
- readline-devel
- sqlite-devel
- sudo
- tcl-devel
- tk-devel
- which
- xz-devel
- zlib-devel
-)
-yum install -y "${packages[@]}"
diff --git a/etc/pkgs/000-dummy.sh b/etc/pkgs/000-dummy.sh
index 06bd986..06bd986 100644..100755
--- a/etc/pkgs/000-dummy.sh
+++ b/etc/pkgs/000-dummy.sh
diff --git a/etc/pkgs/001-gcc.sh b/etc/pkgs/001-gcc.sh
index 52c01da..21065cd 100755
--- a/etc/pkgs/001-gcc.sh
+++ b/etc/pkgs/001-gcc.sh
@@ -12,7 +12,7 @@ url_isl=http://isl.gforge.inria.fr/isl-${version_isl}.tar.bz2
version_cloog=0.18.4
url_cloog="http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-${version_cloog}.tar.gz"
-sudo yum install -y wget
+# Ensure 64-bit libraries go into /lib
sudo ln -sf ${TOOLCHAIN_LIB} ${TOOLCHAIN}/lib64
curl -LO ${url}
@@ -49,7 +49,7 @@ pushd ${bld}
--prefix=${TOOLCHAIN} \
--libdir=${TOOLCHAIN_LIB} \
--libexecdir=${TOOLCHAIN_LIB} \
- --disable-bootstrap \
+ --disable-static \
--disable-multilib \
--disable-werror \
--disable-libunwind-exceptions \
@@ -58,6 +58,8 @@ pushd ${bld}
--with-system-zlib \
--with-isl \
--with-linker-hash-style=gnu \
+ --with-tune=generic \
+ --enable-bootstrap \
--enable-languages=c,c++,fortran,lto,go \
--enable-shared \
--enable-threads=posix \
@@ -78,6 +80,9 @@ pushd ${bld}
make -j${_maxjobs}
make install-strip
+ # Binutils build cannot use this static archive
+ rm -f "${TOOLCHAIN_LIB}/libiberty.a"
+
# Prevent ldconfig from picking up gdb python scripts
autoload="${TOOLCHAIN_DATA}/gdb/auto-load${TOOLCHAIN_LIB}"
mkdir -p "${autoload}"
diff --git a/etc/pkgs/002-binutils.sh b/etc/pkgs/002-binutils.sh
index bd119fe..83423be 100755
--- a/etc/pkgs/002-binutils.sh
+++ b/etc/pkgs/002-binutils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
name=binutils
version=2.31.1
url=https://ftp.gnu.org/gnu/binutils/${name}-${version}.tar.gz
@@ -10,7 +10,17 @@ mkdir -p binutils
pushd binutils
../${name}-${version}/configure \
--prefix=${TOOLCHAIN} \
- --with-sysroot=${TOOLCHAIN}
- make -j${_maxjobs}
- make install
+ --target=x86_64-pc-linux-gnu \
+ --enable-shared \
+ --enable-lto \
+ --enable-gold \
+ --enable-ld=default \
+ --enable-plugins \
+ --enable-threads \
+ --disable-static \
+ --disable-multilib \
+ --with-sysroot=/ \
+ --with-tune=generic
+ make -j4
+ make install-strip
popd
diff --git a/etc/pkgs/003-openssh.sh b/etc/pkgs/003-openssl.sh
index 1f99fe8..c5aaabe 100755
--- a/etc/pkgs/003-openssh.sh
+++ b/etc/pkgs/003-openssl.sh
@@ -54,7 +54,7 @@ function build()
zlib-dynamic \
shared \
no-ssl3-method
- make
+ make -j${_maxjobs}
make install MANDIR="${prefix}/share/man" MANSUFFIX=ssl
popd
post