From d7d7a3bdb834471d61e2c4523c38e3517e46768d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= Date: Mon, 3 Dec 2018 01:03:38 +0100 Subject: [PATCH 1/5] component/perl-Text-Template: new component --- component/perl-Text-Template/buildout.cfg | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 component/perl-Text-Template/buildout.cfg diff --git a/component/perl-Text-Template/buildout.cfg b/component/perl-Text-Template/buildout.cfg new file mode 100644 index 0000000000..074cb3946a --- /dev/null +++ b/component/perl-Text-Template/buildout.cfg @@ -0,0 +1,11 @@ +[buildout] +extends = + ../perl/buildout.cfg +parts = + perl-Text-Template + +[perl-Text-Template] +<= perl-CPAN-package +module =Text/Text-Template +version = 1.53 +md5sum = 904981e0ff233c4ab6099f4d889729c8 -- 2.30.9 From de28becde5c61af4c293e27dd40895aa11f9fdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= Date: Mon, 3 Dec 2018 01:03:41 +0100 Subject: [PATCH 2/5] component/openssl: run test suite at compile time this depends on perl Text::Template module --- component/openssl/buildout.cfg | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/component/openssl/buildout.cfg b/component/openssl/buildout.cfg index 5ec990bff1..edd3f6a05f 100644 --- a/component/openssl/buildout.cfg +++ b/component/openssl/buildout.cfg @@ -8,7 +8,7 @@ extends = ../ca-certificates/buildout.cfg ../coreutils/buildout.cfg ../patch/buildout.cfg - ../perl/buildout.cfg + ../perl-Text-Template/buildout.cfg ../zlib/buildout.cfg parts = @@ -37,13 +37,14 @@ configure-options = make-options = SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib' make-targets = - install_sw install_ssldirs && + test install_sw install_ssldirs && rm -f ${:certs}/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0 ; done environment = - PERL=${perl:location}/bin/perl + PERL=${perl-Text-Template:perl-bin} + [openssl-output] # Shared binary location to ease migration @@ -80,9 +81,9 @@ configure-options = make-options = SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib' make-targets = - install_sw && x=${:location}/etc/ssl/certs && rm -f $x/* && + test install_sw && x=${:location}/etc/ssl/certs && rm -f $x/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sfv $i $x/`${:location}/bin/openssl x509 -hash -noout -in $i`.0 ; done environment = - PERL=${perl:location}/bin/perl + PERL=${perl-Text-Template:perl-bin} -- 2.30.9 From 3699186cdcbc3fd2ba8ba0d27830664530243a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= Date: Mon, 3 Dec 2018 01:03:43 +0100 Subject: [PATCH 3/5] component/python-2.7: run test suite at compile time --- component/python-2.7/buildout.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/component/python-2.7/buildout.cfg b/component/python-2.7/buildout.cfg index d537780ddf..730007a0d3 100644 --- a/component/python-2.7/buildout.cfg +++ b/component/python-2.7/buildout.cfg @@ -53,9 +53,11 @@ configure-options = --with-system-expat --with-system-ffi --with-threads -# Profiled build: +# Enable profile guided optimization ( https://github.com/python/cpython/blob/2.7/README#L194 ) +# this will run part of the test suite, but ignore failures. We don't want to ignore failure and we +# want to run the full test suite, so we make `test` target. As a result of this we run test suite twice. make-binary = -make-targets = make profile-opt && make install +make-targets = make profile-opt && make test install extra-ldflags = # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic, -- 2.30.9 From 9000c80440905692e9b15fd9b99c591281132eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= Date: Mon, 3 Dec 2018 01:03:45 +0100 Subject: [PATCH 4/5] component/python-2.7: use openssl 1.0 for now openssl 1.1 does not pass test suite --- component/python-2.7/buildout.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/component/python-2.7/buildout.cfg b/component/python-2.7/buildout.cfg index 730007a0d3..106e5c88d6 100644 --- a/component/python-2.7/buildout.cfg +++ b/component/python-2.7/buildout.cfg @@ -64,5 +64,5 @@ extra-ldflags = # which would otherwise load the system libmagic.so with ctypes environment = PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s - CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include - LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib ${:extra-ldflags} + CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl-1.0:location}/include -I${sqlite3:location}/include -I${gettext:location}/include + LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl-1.0:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib ${:extra-ldflags} -- 2.30.9 From f2d759a587ae5974ef088b5cf4caed7253250c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= Date: Mon, 3 Dec 2018 01:03:49 +0100 Subject: [PATCH 5/5] component/python3: run test suite at compile time --- component/python3/buildout.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/component/python3/buildout.cfg b/component/python3/buildout.cfg index f78694fd42..91ffc984e0 100644 --- a/component/python3/buildout.cfg +++ b/component/python3/buildout.cfg @@ -37,9 +37,10 @@ configure-options = --with-system-expat --with-system-ffi --with-threads -# Profiled build: +# Profiled build: https://github.com/python/cpython#profile-guided-optimization --enable-optimizations pre-install = mkdir profile-opt +make-targets = test install # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic, # which would otherwise load the system libmagic.so with ctypes -- 2.30.9