summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/mesa-libcl/PKGBUILD8
-rw-r--r--libre/mesa-libcl/remove-libpthread-stubs.patch25
2 files changed, 16 insertions, 17 deletions
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 351e8e511..ae7c3d34e 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -17,7 +17,7 @@ makedepends=('python2-mako' 'dri2proto' 'dri3proto' 'glproto' 'presentproto' 'py
provides=("$_pkgname" 'opencl-icd-loader')
conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx' 'ocl-icd')
replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx')
-source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-13.0.0-rc2.tar.xz{,.sig}
+source=(ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%rc2}/$pkgbase-${pkgver//r/-r}.tar.xz{,.sig}
remove-libpthread-stubs.patch)
sha256sums=('ef26031a79b915e1643b0ffe5354f8ae774cd445f12b342abac63438f9735a43'
'SKIP'
@@ -25,7 +25,7 @@ sha256sums=('ef26031a79b915e1643b0ffe5354f8ae774cd445f12b342abac63438f9735a43'
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
prepare() {
- cd $srcdir/$pkgbase-$pkgver
+ cd $srcdir/$pkgbase-${pkgver//r/-r}
# Fix detection of libLLVM when builds with CMake
sed -i 's/LLVM_SO_NAME=.*/LLVM_SO_NAME=LLVM/' configure
@@ -37,7 +37,7 @@ prepare() {
}
build() {
- cd $srcdir/$pkgbase-$pkgver
+ cd $srcdir/$pkgbase-${pkgver//r/-r}
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -57,7 +57,7 @@ build() {
}
package() {
- cd $srcdir/$pkgbase-$pkgver
+ cd $srcdir/$pkgbase-${pkgver//r/-r}
install -vm755 -d $pkgdir/usr/lib/
cp -rv $srcdir/fakeinstall/usr/lib/libOpenCL* $pkgdir/usr/lib/
diff --git a/libre/mesa-libcl/remove-libpthread-stubs.patch b/libre/mesa-libcl/remove-libpthread-stubs.patch
index 5b44d03cc..efe8aaddd 100644
--- a/libre/mesa-libcl/remove-libpthread-stubs.patch
+++ b/libre/mesa-libcl/remove-libpthread-stubs.patch
@@ -1,14 +1,13 @@
-diff -ur mesa-orig/configure.ac mesa-origb/configure.ac
---- mesa-orig/configure.ac 2016-05-25 15:37:44.191643017 +0200
-+++ mesa-origb/configure.ac 2016-05-25 15:42:20.861654709 +0200
-@@ -813,10 +813,6 @@
- dnl pkgconfig files.
- test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+diff --git a/configure.ac b/configure.ac
+index 54416b4..8a708d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
- [AS_HELP_STRING([--enable-selinux],
+ dnl pthread-stubs is mandatory on targets where it exists
+ case "$host_os" in
+-cygwin* )
++cygwin* | linux* )
+ pthread_stubs_possible="no"
+ ;;
+ * )