Merge pull request #5467 from pogojotz/alpine-linux-build

alpine: fix build on current 'edge' version of Alpine
This commit is contained in:
Donatas Abraitis 2020-01-05 22:10:34 +02:00 committed by GitHub
commit 8728ae46c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -17,7 +17,7 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl
linux-headers lzip lzo m4 make mkinitfs mpc1 mpfr4 mtools musl-dev linux-headers lzip lzo m4 make mkinitfs mpc1 mpfr4 mtools musl-dev
ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre
perl pkgconf python2 python2-dev readline readline-dev sqlite-libs perl pkgconf python2 python2-dev readline readline-dev sqlite-libs
squashfs-tools sudo tar texinfo xorriso xz-libs py-pip py-sphinx rtrlib squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib
rtrlib-dev" rtrlib-dev"
checkdepends="pytest py-setuptools" checkdepends="pytest py-setuptools"
install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall" install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall"
@ -34,6 +34,12 @@ _user=frr
build() { build() {
cd "$builddir" cd "$builddir"
_localpythondir=$PWD/.python
pip2 install --prefix $_localpythondir sphinx
export PATH=${_localpythondir}/bin:$PATH
export PYTHONPATH=${_localpythondir}/lib/python2.7/site-packages
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--sbindir=$_sbindir \ --sbindir=$_sbindir \

View File

@ -42,6 +42,7 @@ USER builder
RUN cd /dist \ RUN cd /dist \
&& abuild-keygen -a -n \ && abuild-keygen -a -n \
&& abuild checksum \ && abuild checksum \
&& git init \
&& abuild -r -P /pkgs/apk && abuild -r -P /pkgs/apk
# This stage installs frr from the apk # This stage installs frr from the apk