diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 09:51:18 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 09:51:18 +0100 |
| commit | ab7672f26a14ad13b3ffaefd2de09906b2a27606 (patch) | |
| tree | b55bca91726b4ce237bfabb597ee044f4b2427c1 /core | |
| parent | 64dab5e626f0eff2cc7760c018bfbf836f1c9321 (diff) | |
| parent | 0af9aedcd977e42e2f2bda7957f9545d938f058d (diff) | |
| download | packages-ab7672f26a14ad13b3ffaefd2de09906b2a27606.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core')
| -rw-r--r-- | core/glib2/PKGBUILD | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index ae229167..27be5242 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,6 +1,17 @@ +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 - # no documentation + # documentation is not built by i486 slave makedepends=(${makedepends[@]//gtk-doc/}) eval "$( declare -f build | \ @@ -16,8 +27,6 @@ if [ "${CARCH}" = "i486" ]; then ' )" - pkgname=(${pkgname[@]//glib2-docs}) - # 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?) |