diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-03 15:23:09 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-03 15:23:09 -0300 |
| commit | 677a0151eee4e73d8d2715f7e4b6ad364e2e85bc (patch) | |
| tree | 4511f72e9446a7eb6ff2f0b1fd1184f0242a53de | |
| parent | 34accbf1084a7e552c84c9fbe492e6f440651dd0 (diff) | |
fixing multilib build in lib32-mesa-libcl and lib32-opencl-mesa
| -rw-r--r-- | libre-multilib/lib32-mesa-libcl/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre-multilib/lib32-opencl-mesa/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/mesa-libcl/PKGBUILD | 4 |
3 files changed, 27 insertions, 13 deletions
diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD index 24f208812..f73d748df 100644 --- a/libre-multilib/lib32-mesa-libcl/PKGBUILD +++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD @@ -23,14 +23,21 @@ sha512sums=('c5edc62dcd953b67307cd8a10921ad3f07bd72cdb81ca69f68706a757fd6c5e439f build() { cd $srcdir/${pkgbase^}-$pkgver - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - export LLVM_CONFIG=/usr/bin/llvm-config32 + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + export LLVM_CONFIG='/usr/bin/llvm-config32' + if [[ $(uname -o) == GNU/Hurd ]]; then + export _HOST=i686-unknown-gnu + elif [[ $(uname -o) == GNU/Linux ]]; then + export _HOST=i686-unknown-linux-gnu + elif [[ $(uname -o) == GNU/kFreeBSD ]]; then + export _HOST=i686-unknown-kfreebsd-gnu + fi autoreconf -vfi # our automake is far too new for their build system :) - ./configure --prefix=/usr --libdir=/usr/lib32 --enable-32-bit \ + ./configure --prefix=/usr --libdir=/usr/lib32 --host=$_HOST \ --sysconfdir=/etc \ --enable-llvm-shared-libs \ --enable-opencl \ diff --git a/libre-multilib/lib32-opencl-mesa/PKGBUILD b/libre-multilib/lib32-opencl-mesa/PKGBUILD index f6beb9ceb..d82342193 100644 --- a/libre-multilib/lib32-opencl-mesa/PKGBUILD +++ b/libre-multilib/lib32-opencl-mesa/PKGBUILD @@ -21,14 +21,21 @@ sha512sums=('c5edc62dcd953b67307cd8a10921ad3f07bd72cdb81ca69f68706a757fd6c5e439f build() { cd $srcdir/${pkgbase^}-$pkgver - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - export LLVM_CONFIG=/usr/bin/llvm-config32 + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + export LLVM_CONFIG='/usr/bin/llvm-config32' + if [[ $(uname -o) == GNU/Hurd ]]; then + export _HOST=i686-unknown-gnu + elif [[ $(uname -o) == GNU/Linux ]]; then + export _HOST=i686-unknown-linux-gnu + elif [[ $(uname -o) == GNU/kFreeBSD ]]; then + export _HOST=i686-unknown-kfreebsd-gnu + fi autoreconf -vfi # our automake is far too new for their build system :) - ./configure --prefix=/usr --libdir=/usr/lib32 --enable-32-bit \ + ./configure --prefix=/usr --libdir=/usr/lib32 --host=$_HOST \ --sysconfdir=/etc \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-egl-platforms=x11,drm,wayland \ @@ -51,7 +58,7 @@ package() { install -vm755 -d $pkgdir/usr/lib32/ mv -v $srcdir/fakeinstall/usr/lib32/lib*OpenCL* $pkgdir/usr/lib32/ - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe $pkgdir/usr/lib32/ + mv -v $srcdir/fakeinstall/usr/lib32/gallium-pipe $pkgdir/usr/lib32/ install -vm755 -d $pkgdir/usr/share/licenses/$pkgname install -vm644 docs/COPYING $pkgdir/usr/share/licenses/$pkgname diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 4acf684f7..08335d720 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -51,8 +51,8 @@ package() { install -vm755 -d $pkgdir/usr/lib/ mv -v $srcdir/fakeinstall/usr/lib/libOpenCL* $pkgdir/usr/lib/ - install -vm755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{nouveau,r300,swrast,vmwgfx}.so ${pkgdir}/usr/lib/gallium-pipe/ + install -vm755 -d $pkgdir/usr/lib/gallium-pipe + mv -v $srcdir/fakeinstall/usr/lib/gallium-pipe/pipe_{nouveau,r300,swrast,vmwgfx}.so $pkgdir/usr/lib/gallium-pipe/ install -vm755 -d $pkgdir/usr/share/licenses/$pkgname install -vm644 docs/COPYING $pkgdir/usr/share/licenses/$pkgname |