Merge pull request #6490 from qlyoung/fix-alpine-python3-build

alpine: update packages
This commit is contained in:
Donatas Abraitis 2020-06-01 07:57:26 +03:00 committed by GitHub
commit a6796c4141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,7 +6,7 @@ pkgdesc="FRRouting is a fork of quagga"
url="https://frrouting.org/" url="https://frrouting.org/"
arch="x86_64" arch="x86_64"
license="GPL-2.0" license="GPL-2.0"
depends="json-c c-ares ipsec-tools iproute2 python py-ipaddr bash" depends="json-c c-ares ipsec-tools iproute2 python3 py-ipaddr bash"
makedepends="ncurses-dev net-snmp-dev gawk texinfo perl makedepends="ncurses-dev net-snmp-dev gawk texinfo perl
acct autoconf automake bash binutils bison bsd-compat-headers build-base acct autoconf automake bash binutils bison bsd-compat-headers build-base
c-ares c-ares-dev ca-certificates cryptsetup-libs curl device-mapper-libs c-ares c-ares-dev ca-certificates cryptsetup-libs curl device-mapper-libs
@ -16,9 +16,9 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl
libltdl libressl libssh2 libstdc++ libtool libuuid libyang-dev libltdl libressl libssh2 libstdc++ libtool libuuid libyang-dev
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 python3 python3-dev readline readline-dev sqlite-libs
squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev
rtrlib-dev" py3-sphinx"
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"
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
@ -35,11 +35,6 @@ _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 \