Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support build with openssl-1.1.x #433

Merged
merged 7 commits into from
Oct 17, 2019
Merged

Support build with openssl-1.1.x #433

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b872712
support openssl-1.1.x (not supported build opt `enable-tlsext` in ope…
takumakume Oct 16, 2019
d3630bb
Use openssl-1.1 for CI
takumakume Oct 16, 2019
8c62360
Upgrade ubuntu to bionic to use libssl-1.1
takumakume Oct 16, 2019
dd51be5
support build with openssl-1.1 for vagrant
takumakume Oct 16, 2019
88a986c
Fix: "Restart services during package upgrades without asking?"
takumakume Oct 16, 2019
6403fcf
install openssl-1.1 for vagrant
takumakume Oct 16, 2019
e88ed19
Output full build logs in vagrant
takumakume Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
sudo: required
dist: trusty
dist: bionic
language: cpp
compiler:
- gcc
before_install:
- echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" >> /etc/apt/sources.list
- echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" >> /etc/apt/sources.list
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- sudo apt-get -qq update
install:
- sudo apt-get -qq install rake bison git gperf zlib1g-dev g++-4.9 libstdc++-4.9-dev
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9" LD="gcc-4.9"; fi
- $CXX -v
env:
- NGINX_SRC_MAJOR=1
Expand All @@ -34,11 +36,12 @@ env:
NGINX_SRC_PATCH=2

before_script:
- curl -sfL https://www.openssl.org/source/openssl-1.0.2-latest.tar.gz -o openssl-1.0.2.tar.gz
- tar -xzf openssl-1.0.2.tar.gz
- rm openssl-1.0.2.tar.gz
- cd openssl-1.0.2*
- ./config --prefix=/usr/local --shared zlib -fPIC enable-tlsext >> /dev/null 2>&1
- openssl_version=1.1.1
- curl -sfL https://www.openssl.org/source/openssl-${openssl_version}-latest.tar.gz -o openssl-${openssl_version}.tar.gz
- tar -xzf openssl-${openssl_version}.tar.gz
- rm openssl-${openssl_version}.tar.gz
- cd openssl-${openssl_version}*
- ./config --prefix=/usr/local --shared zlib -fPIC >> /dev/null 2>&1
- make >> /dev/null 2>&1
- sudo make install >> /dev/null 2>&1
- sudo ldconfig /usr/local/lib
Expand Down
6 changes: 5 additions & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ openssl: .openssl_build_done
.openssl_configure_done:
(cd $(NGX_OPENSSL_SRC) \
&& if [ -f Makefile ]; then $(MAKE) clean; fi \
&& ./config --prefix=$(NGX_OPENSSL_INSTALL_DIR) --shared zlib -fPIC enable-tlsext $(NGX_OPENSSL_OPT) \
&& OPENSSL_VERSION=`grep '^VERSION' Makefile | head -1 | sed 's/VERSION=//'` \
&& OPENSSL_MAJOR_VERSION=`echo ${OPENSSL_VERSION} | awk -F '.' '{print $1}'` \
&& OPENSSL_MINOR_VERSION=`echo ${OPENSSL_VERSION} | awk -F '.' '{print $2}'` \
&& if [ ${OPENSSL_MAJOR_VERSION} -le 1 && ${OPENSSL_MINOR_VERSION} -eq 0 ]; then ENABLE_TLSEXT='enable-tlsext'; fi \
&& ./config --prefix=$(NGX_OPENSSL_INSTALL_DIR) --shared zlib -fPIC ${ENABLE_TLSEXT} $(NGX_OPENSSL_OPT) \
&& $(MAKE) depend) \
&& cp /dev/null .openssl_configure_done

Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Vagrant.configure("2") do |config|
config.vm.box = "bento/ubuntu-16.04"
config.vm.box = "bento/ubuntu-18.04"
config.vm.provision "shell", :path => "misc/provision.sh", :privileged => false
end
22 changes: 13 additions & 9 deletions misc/Dockerfile.travis_emulate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:14.04
FROM ubuntu:bionic
## emulates Travis.ci environment
# Usage:
# build:
Expand All @@ -8,25 +8,29 @@ FROM ubuntu:14.04
# or,
# docker run -it -v `pwd`:/ngx_mruby ngx_mruby:branch_name

RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" >> /etc/apt/sources.list && \
echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" >> /etc/apt/sources.list
RUN apt-get update
RUN apt-get install -y bash-completion apt-file software-properties-common && apt-file update
RUN add-apt-repository --yes ppa:ubuntu-toolchain-r/test && apt-get update
RUN apt-get install -y \
build-essential wget libpcre3-dev psmisc \
rake bison git gperf zlib1g-dev g++-4.9 libstdc++-4.9-dev \
vim tmux
vim tmux curl

ENV CXX "g++-4.9"
ENV CC "gcc-4.9"
ENV LD "gcc-4.9"

RUN curl -L https://www.openssl.org/source/openssl-1.0.2-latest.tar.gz -o openssl-1.0.2.tar.gz && \
tar -xzf openssl-1.0.2.tar.gz && \
rm openssl-1.0.2.tar.gz && \
cd openssl-1.0.2* && \
./config --prefix=/usr/local --shared zlib -fPIC enable-tlsext && \
RUN openssl_version=1.1.1 && \
curl -sfL https://www.openssl.org/source/openssl-${openssl_version}-latest.tar.gz -o openssl-${openssl_version}.tar.gz && \
tar -xzf openssl-${openssl_version}.tar.gz && \
rm openssl-${openssl_version}.tar.gz && \
cd openssl-${openssl_version}* && \
./config --prefix=/usr/local --shared zlib -fPIC >> /dev/null 2>&1 && \
make && \
sudo make install && \
sudo ldconfig /usr/local/lib
make install && \
ldconfig /usr/local/lib

## Add or -v `pwd`:/ngx_mruby
ADD . /ngx_mruby
Expand Down
24 changes: 23 additions & 1 deletion misc/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,33 @@
#/bin/sh

echo '
export CXX="g++-4.9"
export CC="gcc-4.9"
export LD="gcc-4.9"
' | sudo tee /etc/profile.d/env.sh

grep "^deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" /etc/apt/sources.list || echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" | sudo tee -a /etc/apt/sources.list
grep "^deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" /etc/apt/sources.list || echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" | sudo tee -a /etc/apt/sources.list
echo "libssl1.1 libraries/restart-without-asking boolean true" | sudo debconf-set-selections

sudo apt-get update
sudo apt-get -y install build-essential rake bison git gperf automake m4 \
autoconf libtool cmake pkg-config libcunit1-dev ragel \
libpcre3-dev clang-format-6.0
libpcre3-dev clang-format-6.0 g++-4.9 libstdc++-4.9-dev
sudo apt-get -y remove nano

sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 1000

openssl_version=1.1.1
curl -sfL https://www.openssl.org/source/openssl-${openssl_version}-latest.tar.gz -o openssl-${openssl_version}.tar.gz
tar -xzf openssl-${openssl_version}.tar.gz
rm openssl-${openssl_version}.tar.gz
cd openssl-${openssl_version}*
./config --prefix=/usr/local --shared zlib -fPIC >> /dev/null 2>&1
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you remove these logs? These logs are important to investigate the error.

Travis limited the number of stdout line, but the local build is no limitation.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand.
Fixed: e88ed19

make >> /dev/null 2>&1
sudo make install >> /dev/null 2>&1
sudo ldconfig /usr/local/lib
cd -
openssl version

git clone https://github.com/matsumotory/ngx_mruby