Unsplit the package

Since building lib32- from the same PKGBUILD would require everyone to run a
multilib environment, a split package is suboptimal. Instead, we now package
lib32- separately.

1 files changed, 7 insertions, 37 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9b86480a7d9a..5b6fcb53d904 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,17 @@
 # Maintainer: Sebastian Reuße <seb@wirrsal.net>
-pkgname=(stderred-git lib32-stderred-git)
+pkgname=stderred-git
 _gitname=stderred
 pkgver=v1.0.r30.gab40b5f
-pkgrel=3
+pkgrel=4
 pkgdesc="LD_PRELOAD hack to color stderr output red"
 arch=(i686 x86_64)
 url="https://github.com/sickill/stderred"
 license=(MIT)
 source=(git+https://github.com/sickill/stderred)
-makedepends=(git cmake gcc-libs-multilib)
+depends=(glibc)
+provides=(stderred)
+conflicts=(stderred)
+makedepends=(git cmake)
 md5sums=(SKIP)
 optdepends=('bash: to use the convenience script')
 
@@ -18,14 +21,6 @@ pkgver() {
         sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-    # We need to patch some files to support a multilib-build.
-    cd "$_gitname"
-    sed -i 's|DESTINATION lib|DESTINATION "${LIBDIR}"|' src/CMakeLists.txt
-    sed 's|stderred\.sh|stderred32.sh|' usr/bin/stderred >usr/bin/stderred32
-    sed 's|lib/|lib32/|' usr/share/stderred/stderred.sh >usr/share/stderred/stderred32.sh
-}
-
 build() {
   cd "$srcdir/$_gitname"
 
@@ -34,21 +29,9 @@ build() {
   cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=lib ../src
   make
   popd
-
-  # Build lib32-.
-  if [[ $CARCH == x86_64 ]]; then
-    [ -d build32 ] || mkdir build32
-    pushd build32
-    CFLAGS="$FLAGS -m32" cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=lib32 ../src
-    make
-    popd
-  fi
 }
 
-package_stderred-git() {
-  depends=(glibc)
-  provides=(stderred)
-  conflicts=(stderred)
+package() {
 
   cd "$_gitname"/build
   make DESTDIR="$pkgdir" install
@@ -57,16 +40,3 @@ package_stderred-git() {
   install -D "$srcdir/$_gitname"/usr/bin/stderred "$pkgdir"/usr/bin/stderred
   install -D "$srcdir/$_gitname"/usr/share/stderred/stderred.sh "$pkgdir"/usr/share/stderred/stderred.sh
 }
-
-package_lib32-stderred-git() {
-  depends=(lib32-glibc)
-  provides=(lib32-stderred)
-  conflicts=(lib32-stderred)
-
-  cd "$_gitname"/build32
-  make DESTDIR="$pkgdir" install
-  install -D "$srcdir/$_gitname"/README.md "$pkgdir"/usr/share/doc/stderred/README-stderred32.md
-  install -D "$srcdir/$_gitname"/LICENSE "$pkgdir"/usr/share/licenses/lib32-stderred-git/LICENSE
-  install -D "$srcdir/$_gitname"/usr/bin/stderred32 "$pkgdir"/usr/bin/stderred32
-  install -D "$srcdir/$_gitname"/usr/share/stderred/stderred32.sh "$pkgdir"/usr/share/stderred/stderred32.sh
-}