diff --git a/main/boost/0001-revert-cease-dependence-on-range.patch b/main/boost1.75/0001-revert-cease-dependence-on-range.patch similarity index 100% rename from main/boost/0001-revert-cease-dependence-on-range.patch rename to main/boost1.75/0001-revert-cease-dependence-on-range.patch diff --git a/main/boost/APKBUILD b/main/boost1.75/APKBUILD similarity index 79% rename from main/boost/APKBUILD rename to main/boost1.75/APKBUILD index 18c7e0595fc06f10fabf59299d673a23168438c5..416a4b9871562a5d982713902f827d815ddf0b6c 100644 --- a/main/boost/APKBUILD +++ b/main/boost1.75/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=boost +pkgname=boost1.75 pkgver=1.75.0 _pkgver="${pkgver//./_}" -pkgrel=2 +pkgrel=3 pkgdesc="Free peer-reviewed portable C++ source libraries" url="https://www.boost.org/" arch="all" @@ -17,7 +17,7 @@ source="https://dl.bintray.com/boostorg/release/$pkgver/source/boost_$_pkgver.ta 0001-revert-cease-dependence-on-range.patch boost-context-mips-softfloat.patch " -builddir="$srcdir/${pkgname}_$_pkgver" +builddir="$srcdir/boost_$_pkgver" _enginedir="tools/build/src/engine" _bjam="$builddir"/$_enginedir/b2 @@ -61,6 +61,11 @@ for _lib in $_libs; do done; unset -v _lib subpackages="$subpackages $pkgname-libs" +# Claim the unversioned name, this must be removed once we switch our +# boost to a new version +provides="boost=$pkgver-r$pkgrel" +replaces="boost" + _set_options() { [ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)" @@ -95,7 +100,7 @@ prepare() { cat > user-config.jam <<-__EOF__ using gcc : : $CC : <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ; - using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}${abiflags} }: : : : ${abiflags:+$abiflags }; + using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}$abiflags }: : : : ${abiflags:+$abiflags }; __EOF__ } @@ -146,6 +151,11 @@ static() { pkgdesc="Boost static libraries" depends="$depends_static" + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-static=$pkgver-r$pkgrel" + replaces="boost-static" + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/ } @@ -155,6 +165,11 @@ _boostlib() { pkgdesc="Boost $name shared library" depends="$depends__boostlib" + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-$name=$pkgver-r$pkgrel" + replaces="boost-$name" + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libboost_$name*.so.[0-9]* "$subpkgdir"/usr/lib/ } @@ -162,6 +177,11 @@ _boostlib() { libs() { default_libs + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-libs=$pkgver-r$pkgrel" + replaces="boost-libs" + pkgdesc="Boost shared libraries" depends="$depends_libs" local _pkg; for _pkg in $origsubpackages; do @@ -174,6 +194,24 @@ libs() { rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || : } +dev() { + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-dev=$pkgver-r$pkgrel" + replaces="boost-dev" + + default_dev +} + +doc() { + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-doc=$pkgver-r$pkgrel" + replaces="boost-doc" + + default_doc +} + _pyversion() { "$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))' } diff --git a/main/boost/boost-1.57.0-python-abi_letters.patch b/main/boost1.75/boost-1.57.0-python-abi_letters.patch similarity index 100% rename from main/boost/boost-1.57.0-python-abi_letters.patch rename to main/boost1.75/boost-1.57.0-python-abi_letters.patch diff --git a/main/boost/boost-1.57.0-python-libpython_dep.patch b/main/boost1.75/boost-1.57.0-python-libpython_dep.patch similarity index 100% rename from main/boost/boost-1.57.0-python-libpython_dep.patch rename to main/boost1.75/boost-1.57.0-python-libpython_dep.patch diff --git a/main/boost/boost-context-mips-softfloat.patch b/main/boost1.75/boost-context-mips-softfloat.patch similarity index 100% rename from main/boost/boost-context-mips-softfloat.patch rename to main/boost1.75/boost-context-mips-softfloat.patch