MesaLib: make sure -devel is processed the last one.
... otherwise the 32bit pkg could have incorrect dependencies.
This commit is contained in:
parent
5290c2a839
commit
f96be1bbab
1 changed files with 6 additions and 4 deletions
|
@ -1,7 +1,7 @@
|
||||||
# Template build file for 'MesaLib'.
|
# Template build file for 'MesaLib'.
|
||||||
pkgname=MesaLib
|
pkgname=MesaLib
|
||||||
version=10.2.6
|
version=10.2.6
|
||||||
revision=2
|
revision=3
|
||||||
wrksrc="Mesa-${version}"
|
wrksrc="Mesa-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
|
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
|
||||||
|
@ -25,7 +25,7 @@ makedepends="
|
||||||
|
|
||||||
# Set subpackages manually to set proper rdeps in 32bit pkgs.
|
# Set subpackages manually to set proper rdeps in 32bit pkgs.
|
||||||
subpackages="libglapi libgbm libEGL libGL libGLES libOpenVG libOSMesa
|
subpackages="libglapi libgbm libEGL libGL libGLES libOpenVG libOSMesa
|
||||||
libwayland-egl MesaLib-devel mesa-swraster-dri"
|
libwayland-egl mesa-swraster-dri"
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
i686*|x86_64*)
|
i686*|x86_64*)
|
||||||
|
@ -46,6 +46,9 @@ i686*|x86_64*)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# -devel must be the last one for proper order.
|
||||||
|
subpackages+=" MesaLib-devel"
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
i686*) configure_args+=" --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";;
|
i686*) configure_args+=" --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";;
|
||||||
*) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";;
|
*) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";;
|
||||||
|
@ -219,7 +222,6 @@ mesa-opencl_package() {
|
||||||
replaces="mesa-opencl-git>=0"
|
replaces="mesa-opencl-git>=0"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove etc/OpenCL
|
vmove etc/OpenCL
|
||||||
vmove "/usr/lib/lib*OpenCL*"
|
vmove "usr/lib/lib*OpenCL*"
|
||||||
mv ${XBPS_DESTDIR}/MesaLib-devel-${version}/usr/lib/lib*OpenCL.so ${PKGDESTDIR}/usr/lib
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue