From 53df50a6a6b94249a58d11233b334b9e29cdaadc Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 11 Oct 2018 16:38:17 +0200 Subject: removed gtk-doc patching on i486 --- core/glib2/PKGBUILD | 32 +++++--------------------------- core/kmod/PKGBUILD | 11 ----------- core/libidn2/PKGBUILD | 3 +-- core/libpsl/PKGBUILD | 11 ----------- core/p11-kit/PKGBUILD | 11 ----------- 5 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 core/kmod/PKGBUILD delete mode 100644 core/libpsl/PKGBUILD delete mode 100644 core/p11-kit/PKGBUILD diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 27be5242..f91bb31c 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,34 +1,12 @@ -eval "$( - declare -f package_glib2 | \ - sed ' - 2 a arch=(i486 i686 pentium3 x86_64) - ' - declare -f package_glib2-docs | \ - sed ' - 2 a arch=(any) - ' -)" - # i486-specific if [ "${CARCH}" = "i486" ]; then - # documentation is not built by i486 slave - makedepends=(${makedepends[@]//gtk-doc/}) - eval "$( - declare -f build | \ - sed ' - s/--enable-gtk-doc// - ' - )" - + # all but one test succeed, for now disable testing + # ERROR: timer - too few tests run (expected 7, got 0) + # ERROR: timer - exited with status 134 (terminated by signal 6?) eval "$( - declare -f package_glib2 | \ + declare -f check | \ sed ' - /mv.*gtk-doc/d + s/\(meson test.*\)/\1 || true/ ' )" - - # all but one test succeed, for now disable testing - # ERROR: timer - too few tests run (expected 7, got 0) - # ERROR: timer - exited with status 134 (terminated by signal 6?) - unset check fi diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD deleted file mode 100644 index 184ab2a8..00000000 --- a/core/kmod/PKGBUILD +++ /dev/null @@ -1,11 +0,0 @@ -# i486-specific -if [ "${CARCH}" = "i486" ]; then - # don't build documentation - makedepends=(${makedepends[@]//gtk-doc/}) - eval "$( - declare -f build | \ - sed ' - s/--enable-gtk-doc/--disable-gtk-doc/ - ' - )" -fi diff --git a/core/libidn2/PKGBUILD b/core/libidn2/PKGBUILD index e608d717..4bd3a316 100644 --- a/core/libidn2/PKGBUILD +++ b/core/libidn2/PKGBUILD @@ -1,6 +1,5 @@ # i486-specific if [ "${CARCH}" = "i486" ]; then - # remove dependency on gtk-doc and ruby-ronn - makedepends=(${makedepends[@]//gtk-doc/}) + # remove dependency on ruby-ronn makedepends=(${makedepends[@]//ruby-ronn/}) fi diff --git a/core/libpsl/PKGBUILD b/core/libpsl/PKGBUILD deleted file mode 100644 index bfccdc03..00000000 --- a/core/libpsl/PKGBUILD +++ /dev/null @@ -1,11 +0,0 @@ -# i486-specific -if [ "${CARCH}" = "i486" ]; then - # no documentation - makedepends=(${makedepends[@]//gtk-doc/}) - eval "$( - declare -f build | \ - sed ' - s/--enable-gtk-doc/--disable-gtk-doc/ - ' - )" -fi diff --git a/core/p11-kit/PKGBUILD b/core/p11-kit/PKGBUILD deleted file mode 100644 index 22f7065f..00000000 --- a/core/p11-kit/PKGBUILD +++ /dev/null @@ -1,11 +0,0 @@ -# 486-specific -if [ "${CARCH}" = "i486" ]; then - # no gtk yet - makedepends=(${makedepends[@]//gtk-doc/}) - eval "$( - declare -f build | \ - sed ' - s@--enable-doc@--disable-doc@ - ' - )" -fi -- cgit v1.2.3-70-g09d2