From 54f622c30c17779f0baf224dd61b765f84213c04 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Wed, 7 Nov 2018 07:22:49 +0100
Subject: core/systemd: removed temporary patch for debug in meson

---
 core/systemd/PKGBUILD                              | 23 -------------------
 .../meson-rename-Ddebug-to-Ddebug-extra.patch      | 26 ----------------------
 2 files changed, 49 deletions(-)
 delete mode 100644 core/systemd/PKGBUILD
 delete mode 100644 core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch

(limited to 'core')

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
deleted file mode 100644
index baf567fc..00000000
--- a/core/systemd/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-source+=('meson-rename-Ddebug-to-Ddebug-extra.patch')
-sha512sums+=('d310e7ea099bd371eb12fb4f474f1518ddc1013612d6a53c3f5777e6a3509eb58c4b5989d31bb04784be70db5d8ca39bff47414456c3fe322194cd7b341ae70c')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      /patch.*0001.*/a patch -Np1 -i ../meson-rename-Ddebug-to-Ddebug-extra.patch
-    '
-)"
-
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # temporary, as there is no systemd-journal user for some reason!?
-  eval "$(
-    declare -f package_systemd | \
-      sed '
-        /install.*systemd-journal/d
-      '
-  )"
-
-  # tempoary failure, known upstream, see FS#60239
-  unset check
-fi
diff --git a/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch b/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch
deleted file mode 100644
index 12607f2a..00000000
--- a/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 88a470a..1d864e3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -765,7 +765,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
- 
- enable_debug_hashmap = false
- enable_debug_mmap_cache = false
--foreach name : get_option('debug')
-+foreach name : get_option('debug-extra')
-         if name == 'hashmap'
-                 enable_debug_hashmap = true
-         elif name == 'mmap-cache'
-diff --git a/meson_options.txt b/meson_options.txt
-index 16c1f2b..dc7951b 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
-        description : 'path to debug shell binary')
- option('debug-tty', type : 'string', value : '/dev/tty9',
-        description : 'specify the tty device for debug shell')
--option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
-+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
-        description : 'enable extra debugging')
- option('memory-accounting-default', type : 'boolean',
-        description : 'enable MemoryAccounting= by default')
-- 
cgit v1.2.3-70-g09d2


From c362651f62627e6b52da741d7e84b1312650d786 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Wed, 7 Nov 2018 08:22:46 +0100
Subject: core/systemd: added LZ4 test patch (FS#60239)

---
 core/systemd/PKGBUILD                        | 11 ++++++++++
 core/systemd/lz4-test-compress-partial.patch | 31 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 core/systemd/PKGBUILD
 create mode 100644 core/systemd/lz4-test-compress-partial.patch

(limited to 'core')

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
new file mode 100644
index 00000000..be057de8
--- /dev/null
+++ b/core/systemd/PKGBUILD
@@ -0,0 +1,11 @@
+# LZ4 test fails, see upstream FS#60239
+
+source+=(lz4-test-compress-partial.patch)
+sha512sums+=('afc199c8d091c1b87fa0719b82bb29ff32595d51034127d1a8c7f83f539f52d0d8a4fa90cf22e286bf3e9104603ecfc9275c3527b9adc2d05d9bcb9234e3c208')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      /patch.*/a patch -Np1 -i ../lz4-test-compress-partial.patch
+    '
+)"
diff --git a/core/systemd/lz4-test-compress-partial.patch b/core/systemd/lz4-test-compress-partial.patch
new file mode 100644
index 00000000..421e186f
--- /dev/null
+++ b/core/systemd/lz4-test-compress-partial.patch
@@ -0,0 +1,31 @@
+diff --git a/meson.build b/meson.build
+index 554e67e5dd..3636a0ff8c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1084,6 +1084,7 @@ conf.set10('HAVE_XZ', have)
+ want_lz4 = get_option('lz4')
+ if want_lz4 != 'false' and not fuzzer_build
+         liblz4 = dependency('liblz4',
++                            version : '>= 1.8.3',
+                             required : want_lz4 == 'true')
+         have = liblz4.found()
+ else
+diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c
+index 7addf318d6..fb0db190b2 100644
+--- a/src/journal/test-compress.c
++++ b/src/journal/test-compress.c
+@@ -227,13 +227,10 @@ static void test_lz4_decompress_partial(void) {
+         assert_se(r >= 0);
+         log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE, r);
+ 
+-        /* We expect this to fail, because that's how current lz4 works. If this
+-         * call succeeds, then lz4 has been fixed, and we need to change our code.
+-         */
+         r = LZ4_decompress_safe_partial(buf, huge,
+                                         compressed,
+                                         12, HUGE_SIZE-1);
+-        assert_se(r < 0);
++        assert_se(r >= 0);
+         log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE-1, r);
+ }
+ #endif
-- 
cgit v1.2.3-70-g09d2


From 2b69ff29c1e9e1dfa61432108efbc477d4e4aceb Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 7 Nov 2018 08:29:47 +0100
Subject: core/gcc: remove spurious change to provides= on i486

---
 core/gcc/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index fecb7d16..f069b2a4 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -103,7 +103,7 @@ if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f package_gcc-libs | \
       sed '
-        s/libgfortran/libquadmath libgfortran/
+        /for lib in / s/libgfortran/libquadmath libgfortran/
       '
   )"
 
-- 
cgit v1.2.3-70-g09d2


From b6eda2c4a958d1a3c01cff8b3cd4081d9ee1c3d0 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 7 Nov 2018 09:09:09 +0100
Subject: core/gcc: force build architecture to $CARCH - else, setarch may fool
 us

---
 core/gcc/PKGBUILD | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'core')

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index f069b2a4..cf97f188 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -13,8 +13,9 @@ eval "$(
     '
   declare -f build | \
     sed '
-      s/--enable-multilib/--disable-multilib/
-      s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
+      /configure/ s/--enable-multilib/--disable-multilib/
+      /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
+      /configure/ s/;$/ --build=$CARCH;/
     '
   declare -f package_gcc-libs | \
     sed '
@@ -83,7 +84,7 @@ if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f build | \
       sed '
-        /enable-languages/ s/ada//
+        /enable-languages/ s/,ada//
       '
   )"
 
-- 
cgit v1.2.3-70-g09d2


From d95efe2731e3351194283a116970a42f567fd277 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 7 Nov 2018 09:38:34 +0100
Subject: core/gcc: fix --build option for configure

---
 core/gcc/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index cf97f188..4e1592fc 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -15,7 +15,7 @@ eval "$(
     sed '
       /configure/ s/--enable-multilib/--disable-multilib/
       /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
-      /configure/ s/;$/ --build=$CARCH;/
+      /configure/ s/;$/ --build=$CARCH-pc-linux-gnu;/
     '
   declare -f package_gcc-libs | \
     sed '
-- 
cgit v1.2.3-70-g09d2


From c9295b01f38f1828fb23cebd16539e360d16d03e Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 8 Nov 2018 22:32:58 +0100
Subject: core/gzip: remove temporary patch

---
 core/gzip/PKGBUILD     |   5 --
 core/gzip/gnulib.patch | 189 -------------------------------------------------
 2 files changed, 194 deletions(-)
 delete mode 100644 core/gzip/PKGBUILD
 delete mode 100644 core/gzip/gnulib.patch

(limited to 'core')

diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD
deleted file mode 100644
index ef13027a..00000000
--- a/core/gzip/PKGBUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-# see: https://bugs.archlinux.org/task/60202
-# source: https://src.fedoraproject.org/rpms/gzip/raw/master/f/gnulib.patch
-
-source+=('gnulib.patch')
-md5sums+=('SKIP')
diff --git a/core/gzip/gnulib.patch b/core/gzip/gnulib.patch
deleted file mode 100644
index 68e8d518..00000000
--- a/core/gzip/gnulib.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <address@hidden>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-* lib/fbufmode.c (fbufmode):
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpending.c (__fpending):
-* lib/fpurge.c (fpurge):
-* lib/freadable.c (freadable):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/freadptr.c (freadptr):
-* lib/freadseek.c (freadptrinc):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-* lib/fwritable.c (fwritable):
-* lib/fwriting.c (fwriting):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.
----
- ChangeLog        | 23 +++++++++++++++++++++++
- lib/fbufmode.c   |  2 +-
- lib/fflush.c     |  6 +++---
- lib/fpending.c   |  2 +-
- lib/fpurge.c     |  2 +-
- lib/freadable.c  |  2 +-
- lib/freadahead.c |  2 +-
- lib/freading.c   |  2 +-
- lib/freadptr.c   |  2 +-
- lib/freadseek.c  |  2 +-
- lib/fseeko.c     |  4 ++--
- lib/fseterr.c    |  2 +-
- lib/fwritable.c  |  2 +-
- lib/fwriting.c   |  2 +-
- lib/stdio-impl.h |  6 ++++++
- 15 files changed, 45 insertions(+), 16 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 667f91663..beb835670 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,26 @@
-+2018-03-05  Paul Eggert  <address@hidden>
-+
-+	fflush: adjust to glibc 2.28 libio.h removal
-+	Problem reported by Daniel P. Berrangé in:
-+	https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-+	* lib/fbufmode.c (fbufmode):
-+	* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-+	(disable_seek_optimization, rpl_fflush):
-+	* lib/fpending.c (__fpending):
-+	* lib/fpurge.c (fpurge):
-+	* lib/freadable.c (freadable):
-+	* lib/freadahead.c (freadahead):
-+	* lib/freading.c (freading):
-+	* lib/freadptr.c (freadptr):
-+	* lib/freadseek.c (freadptrinc):
-+	* lib/fseeko.c (fseeko):
-+	* lib/fseterr.c (fseterr):
-+	* lib/fwritable.c (fwritable):
-+	* lib/fwriting.c (fwriting):
-+	Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-+	* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-+	Define if not already defined.
-+
- 2018-01-07  Jim Meyering  <meyering@fb.com>
- 
- 	version 1.9
- 	* NEWS: Record release date.
-diff --git a/lib/fflush.c b/lib/fflush.c
-index 983ade0ff..a6edfa105 100644
---- a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
- 
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
- 
- #endif
- 
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
- 
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
-   if (stream == NULL || ! freading (stream))
-     return fflush (stream);
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
-   clear_ungetc_buffer_preserving_position (stream);
- 
-diff --git a/lib/fpurge.c b/lib/fpurge.c
-index b1d417c7a..3aedcc373 100644
---- a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_IO_read_end = fp->_IO_read_ptr;
-   fp->_IO_write_ptr = fp->_IO_write_base;
-   /* Avoid memory leak when there is an active ungetc buffer.  */
-diff --git a/lib/freading.c b/lib/freading.c
-index 73c28acdd..c24d0c88a 100644
---- a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return ((fp->_flags & _IO_NO_WRITES) != 0
-           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
-               && fp->_IO_read_base != NULL));
-diff --git a/lib/fseeko.c b/lib/fseeko.c
-index 0101ab55f..193f4e8ce 100644
---- a/lib/fseeko.c
-+++ b/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-diff --git a/lib/fseterr.c b/lib/fseterr.c
-index 82649c3ac..adb637256 100644
---- a/lib/fseterr.c
-+++ b/lib/fseterr.c
-@@ -29,7 +29,7 @@ fseterr (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_flags |= _IO_ERR_SEEN;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
-index 78d896e9f..05c5752a2 100644
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 
--- 
-2.14.3
-
-- 
cgit v1.2.3-70-g09d2


From 9aea894702c1229f2b9e744c34d17dcf20f27891 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 9 Nov 2018 09:49:55 +0100
Subject: core/make: removed all patches, they are applied upstream

---
 ...1-glob-Do-not-assume-glibc-glob-internals.patch | 64 ----------------------
 core/make/FS55127.patch                            | 26 ---------
 core/make/FS58674.patch                            | 15 -----
 core/make/PKGBUILD                                 | 12 ----
 4 files changed, 117 deletions(-)
 delete mode 100644 core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
 delete mode 100644 core/make/FS55127.patch
 delete mode 100644 core/make/FS58674.patch
 delete mode 100644 core/make/PKGBUILD

(limited to 'core')

diff --git a/core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
deleted file mode 100644
index b88ebcaf..00000000
--- a/core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sun, 24 Sep 2017 09:12:58 -0400
-Subject: [PATCH 01/26] glob: Do not assume glibc glob internals.
-
-It has been proposed that glibc glob start using gl_lstat,
-which the API allows it to do.  GNU 'make' should not get in
-the way of this.  See:
-https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
-
-* dir.c (local_lstat): New function, like local_stat.
-(dir_setup_glob): Use it to initialize gl_lstat too, as the API
-requires.
-
-diff --git a/dir.c b/dir.c
-index adbb8a9..c343e4c 100644
---- a/dir.c
-+++ b/dir.c
-@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
- }
- #endif
- 
-+/* Similarly for lstat.  */
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-+# ifndef VMS
-+#  ifndef HAVE_SYS_STAT_H
-+int lstat (const char *path, struct stat *sbuf);
-+#  endif
-+# else
-+    /* We are done with the fake lstat.  Go back to the real lstat */
-+#   ifdef lstat
-+#     undef lstat
-+#   endif
-+# endif
-+# define local_lstat lstat
-+#elif defined(WINDOWS32)
-+/* Windows doesn't support lstat().  */
-+# define local_lstat local_stat
-+#else
-+static int
-+local_lstat (const char *path, struct stat *buf)
-+{
-+  int e;
-+  EINTRLOOP (e, lstat (path, buf));
-+  return e;
-+}
-+#endif
-+
- void
- dir_setup_glob (glob_t *gl)
- {
-   gl->gl_opendir = open_dirstream;
-   gl->gl_readdir = read_dirstream;
-   gl->gl_closedir = free;
-+  gl->gl_lstat = local_lstat;
-   gl->gl_stat = local_stat;
--  /* We don't bother setting gl_lstat, since glob never calls it.
--     The slot is only there for compatibility with 4.4 BSD.  */
- }
- 
- void
--- 
-2.18.0
-
diff --git a/core/make/FS55127.patch b/core/make/FS55127.patch
deleted file mode 100644
index 9b5291cc..00000000
--- a/core/make/FS55127.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9d4e06084a4c7da480bd49a3487aadf6ba77b54 Mon Sep 17 00:00:00 2001
-From: Enrique Olaizola <enrique_olaizola16@hotmail.com>
-Date: Sat, 27 May 2017 14:24:33 -0400
-Subject: * tests/run_make_tests.pl: [SV 50902] Find Perl modules
-
----
- tests/run_make_tests.pl | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
-index a74417a..a844094 100644
---- a/tests/run_make_tests.pl
-+++ b/tests/run_make_tests.pl
-@@ -64,6 +64,9 @@ if ($^O eq 'VMS')
-   $CMD_rmfile = 'delete_file -no_ask';
- }
- 
-+use FindBin;
-+use lib "$FindBin::Bin";
-+
- require "test_driver.pl";
- require "config-flags.pm";
- 
--- 
-cgit v1.0-41-gc330
-
diff --git a/core/make/FS58674.patch b/core/make/FS58674.patch
deleted file mode 100644
index 82f42ea5..00000000
--- a/core/make/FS58674.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rauN make-4.2.1/configure.ac make-4.2.1-alloca-patch/configure.ac
---- make-4.2.1/configure.ac	2016-06-06 12:27:31.000000000 +0000
-+++ make-4.2.1-alloca-patch/configure.ac	2018-07-19 06:17:41.011662796 +0000
-@@ -399,10 +399,9 @@
- #include <glob.h>
- #include <fnmatch.h>
- 
--#define GLOB_INTERFACE_VERSION 1
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
- # include <gnu-versions.h>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
-    gnu glob
- # endif
- #endif],
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
deleted file mode 100644
index 45ca70ce..00000000
--- a/core/make/PKGBUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-source+=('FS55127.patch' 'FS58674.patch' '0001-glob-Do-not-assume-glibc-glob-internals.patch')
-md5sums+=('8efba0d7ff90f5394edda0f83259af05' '95fcc032a728e134f620a402e6922389' 'a68d9cdcde0287bd2cc253a7722a2893')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      /^\s*cd\s/a  patch -p1 -i ${srcdir}/FS55127.patch
-      /^\s*cd\s/a  patch -p1 -i ${srcdir}/FS58674.patch
-      /^\s*cd\s/a  patch -p1 -i ${srcdir}/0001-glob-Do-not-assume-glibc-glob-internals.patch
-    '
-)"
-
-- 
cgit v1.2.3-70-g09d2


From aa6ff30d671d88b3d6ba88a51121deb50254634f Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 9 Nov 2018 13:22:15 +0100
Subject: core/groff: repair dependency-removal

---
 core/groff/PKGBUILD | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'core')

diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index 457c89e6..6bda4b0c 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -1,6 +1,2 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no optional dependencies
-  makedepends=(${makedepends[@]//psutils/})
-fi
-
+makedepends=(${makedepends[@]//psutils/})
+makedepends_i686=(psutils)
-- 
cgit v1.2.3-70-g09d2


From bcb5133554da96e552b4d74fe48d336a80efebed Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 9 Nov 2018 13:53:18 +0100
Subject: "if [ $CARCH = ... ]; then depends=..; fi" => "depends_...=..."

---
 core/automake/PKGBUILD       |  7 +++----
 core/dbus/PKGBUILD           |  8 +++-----
 core/glibc/PKGBUILD          |  2 +-
 core/groff/PKGBUILD          |  2 +-
 core/libidn2/PKGBUILD        |  8 +++-----
 core/libsecret/PKGBUILD      |  7 ++++---
 core/links/PKGBUILD          |  8 +++-----
 core/linux/PKGBUILD          |  2 +-
 core/pinentry/PKGBUILD       | 14 +++++++++-----
 core/shadow/PKGBUILD         |  7 +++++--
 extra/cmake/PKGBUILD         |  5 ++++-
 extra/doxygen/PKGBUILD       | 24 ++++++++++++++----------
 extra/git/PKGBUILD           |  5 ++++-
 extra/hwloc/PKGBUILD         |  8 +++-----
 extra/java7-openjdk/PKGBUILD |  7 ++++---
 extra/jsoncpp/PKGBUILD       |  7 +++++--
 extra/libjpeg-turbo/PKGBUILD |  5 ++++-
 extra/libunwind/PKGBUILD     |  8 +++-----
 extra/libxkbcommon/PKGBUILD  |  7 +++++--
 extra/nasm/PKGBUILD          |  6 ++++--
 extra/python/PKGBUILD        |  2 +-
 extra/python2/PKGBUILD       |  2 +-
 extra/qt5-base/PKGBUILD      |  2 +-
 extra/subversion/PKGBUILD    | 35 +++++++++++++++++++----------------
 extra/wayland/PKGBUILD       | 11 +++++++----
 multilib/fasm/PKGBUILD       |  2 +-
 26 files changed, 113 insertions(+), 88 deletions(-)

(limited to 'core')

diff --git a/core/automake/PKGBUILD b/core/automake/PKGBUILD
index af9256a9..e1221ed5 100644
--- a/core/automake/PKGBUILD
+++ b/core/automake/PKGBUILD
@@ -1,5 +1,4 @@
 # 486-specific: we have no Vala or Java at the moment
-if [ "${CARCH}" = "i486" ]; then
-  checkdepends=(${checkdepends[@]//vala/})
-  checkdepends=(${checkdepends[@]//java-environment/})
-fi
+checkdepends=(${checkdepends[@]//vala/})
+checkdepends=(${checkdepends[@]//java-environment/})
+checkdepends_i686+=(vala java-environment)
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 41a96d38..835abb54 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no graphviz generated graphs in documentation
-  makedepends=(${makedepends[@]//graphviz/})
-fi
+# no graphviz generated graphs in documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 7e0ce35f..02dbf6e4 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -27,7 +27,7 @@ eval "$(
 
 # no gd for memory profiles
 makedepends=(${makedepends[@]//gd/})
-makedepends_i686=('gd')
+makedepends_i686+=('gd')
 
 if [ "${CARCH}" = "i486" ]; then
 
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index 6bda4b0c..f06aaa84 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -1,2 +1,2 @@
 makedepends=(${makedepends[@]//psutils/})
-makedepends_i686=(psutils)
+makedepends_i686+=(psutils)
diff --git a/core/libidn2/PKGBUILD b/core/libidn2/PKGBUILD
index 4bd3a316..23ba1170 100644
--- a/core/libidn2/PKGBUILD
+++ b/core/libidn2/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # remove dependency on ruby-ronn 
-  makedepends=(${makedepends[@]//ruby-ronn/})
-fi
+# remove dependency on ruby-ronn on i486
+makedepends=(${makedepends[@]//ruby-ronn/})
+makedepends_i686+=(ruby-ronn)
diff --git a/core/libsecret/PKGBUILD b/core/libsecret/PKGBUILD
index d2a68fe8..9aab2048 100644
--- a/core/libsecret/PKGBUILD
+++ b/core/libsecret/PKGBUILD
@@ -1,8 +1,9 @@
+# no Vala on i486
+makedepends=(${makedepends[@]//vala/})
+makedepends_i686+=(vala)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
-  # no Vala
-  makedepends=(${makedepends[@]//vala/})
-
   # no Gnome (gjs), no dbus-glib
   unset check
 fi
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index bbe7457e..b30ed33e 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no librsvg, has a cycle with half of gtk
-  makedepends=(${makedepends[@]//librsvg/})  
-fi
+# no librsvg on i486, requires rust - yuck
+makedepends=(${makedepends[@]//librsvg/})
+makedepends_i686+=(librsvg)
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 5f021765..8ca51dd2 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -11,7 +11,7 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do
 done
 
 makedepends=(${makedepends[@]/graphviz/})
-makedepends_i686=(graphviz)
+makedepends_i686+=(graphviz)
 
 eval "$(
   declare -f prepare | \
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index 9c1f0644..a36a140d 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -1,8 +1,15 @@
+# no GUI stuff on i486
+makedepends=(${makedepends[@]//gtk2/})
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(gtk2 qt5-base)
+
+# no gcr on i486
+makedepends=(${makedepends[@]//gcr/})
+makedepends_i686+=(gcr)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no GUI stuff
-  makedepends=(${makedepends[@]//gtk2/})
-  makedepends=(${makedepends[@]//qt5-base/})
   eval "$(
     declare -f build | \
       sed '
@@ -11,7 +18,4 @@ if [ "${CARCH}" = "i486" ]; then
         s/--enable-pinentry-qt/--disable-pinentry-qt/
       '
   )"
-
-  # no gcr
-  makedepends=(${makedepends[@]//gcr/})
 fi
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index ef3f908c..b625f595 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,9 +1,12 @@
+# remove dependency on Gnome's xml2po on i486 (needed for building the
+# man pages, draws in far too many dependencies)
+makedepends=(${makedepends[@]//gnome-doc-utils/})
+makedepends_i686+=(gnome-doc-utils)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # remove dependency on Gnome's xml2po (needed for building the man pages,
   # draws in far too many dependencies)
-  makedepends=(${makedepends[@]//gnome-doc-utils/})
-  
   eval "$(
     declare -f prepare | \
       sed '
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 2128d8f8..2ca8c08f 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,7 +1,10 @@
+# no Qt5 GUI on i486
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(qt5-base)
+
 # 486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no Qt5 GUI
-  makedepends=(${makedepends[@]//qt5-base/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 24e360d8..72ebfd3a 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -9,20 +9,24 @@ eval "$(
     '
 )"
 
-if [ "${CARCH}" = "i486" ]; then
-  # no qt5
-  makedepends=(${makedepends[@]//qt5-base/})
+# no qt5 on i486
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(qt5-base)
 
-  # no TeX
-  makedepends=(${makedepends[@]//texlive-core/})
-  makedepends=(${makedepends[@]//texlive-latexextra/})
+# no TeX on i486
+makedepends=(${makedepends[@]//texlive-core/})
+makedepends=(${makedepends[@]//texlive-latexextra/})
+makedepends_i686+=(texlive-core texlive-latexextra)
 
-  # no Graphviz
-  makedepends=(${makedepends[@]//graphviz/})
+# no Graphviz on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
 
-  # no ghostscript
-  makedepends=(${makedepends[@]//ghostscript/})
+# no ghostscript on i486
+makedepends=(${makedepends[@]//ghostscript/})
+makedepends_i686+=(ghostscript)
 
+if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 36b2d040..b66cc8dc 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,7 +1,10 @@
+# no Gnome on i486
+makedepends=(${makedepends[@]//libgnome-keyring/})
+makedepends_i686+=(libgnome-keyring)
+
 # 486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no Gnome
-  makedepends=(${makedepends[@]//libgnome-keyring/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index f271a407..f2d05b95 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no cairo
-  makedepends=(${makedepends[@]//cairo/})
-fi
+# no cairo on i486
+makedepends=(${makedepends[@]//cairo/})
+makedepends_i686+=(cairo)
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index b36e427d..2112d4ad 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,7 +1,8 @@
+# gtk2 is an optdepend
+makedepends=(${makedepends[@]//gtk2/})
+makedepends_i686+=(gtk2)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   _JARCH=i386
-
-  # gtk2 is an optdepend
-  makedepends=(${makedepends[@]//gtk2/})
 fi
diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD
index 519381b5..64e3d308 100644
--- a/extra/jsoncpp/PKGBUILD
+++ b/extra/jsoncpp/PKGBUILD
@@ -1,7 +1,10 @@
+# no graphviz on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
+
 # 486-specific
 if [ "${CARCH}" = "i486" ]; then
-  # do graphviz
-  makedepends=(${makedepends[@]//graphviz/})
+  # no graphviz
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index e33bc686..15f620d3 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,6 +1,9 @@
+# no Java on i486
+makedepends=(${makedepends[@]//jdk8-openjdk/})
+makedepends_i686+=(jdk8-openjdk)
+
 if [ "${CARCH}" = "i486" ]; then
   # no Java
-  makedepends=(${makedepends[@]//jdk8-openjdk/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/libunwind/PKGBUILD b/extra/libunwind/PKGBUILD
index 8bf87ab2..a8d82b23 100644
--- a/extra/libunwind/PKGBUILD
+++ b/extra/libunwind/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no TeX for documentation
-  makedepends=(${makedepends[@]//texlive-core/})
-fi
+# no TeX for documentation on i486
+makedepends=(${makedepends[@]//texlive-core/})
+makedepends_i686+=(texlive-core)
diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
index 802fc9c2..d5c1d607 100644
--- a/extra/libxkbcommon/PKGBUILD
+++ b/extra/libxkbcommon/PKGBUILD
@@ -1,8 +1,11 @@
+# no documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends=(${makedepends[@]//doxygen/})
+makedepends_i686+=(graphviz doxygen)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no documentation
-  makedepends=(${makedepends[@]//graphviz/})
-  makedepends=(${makedepends[@]//doxygen/})
 
   eval "$(
     declare -f build | \
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 36e81008..6e1fab99 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -6,11 +6,13 @@ prepare() {
   patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch"
 }
 
+# remove ttf-liberation on i486 (X packages missing for installing the font)
+makedepends=(${makedepends[@]//ttf-liberation/})
+makedepends_i686+=(ttf-liberation)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # remove ttf-liberation (X packages missing for installing the font)
-  makedepends=(${makedepends[@]//ttf-liberation/})
-
   eval "$(
     declare -f build | \
       sed "
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 5521b6d6..43352eb3 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -16,7 +16,7 @@ eval "$(
 )"
 
 makedepends=(${makedepends[@]//xorg-server-xvfb/})
-makedepends_i686=(xorg-server-xvfb)
+makedepends_i686+=(xorg-server-xvfb)
 
 # skip xvfb stuff on i486
 if [ "$CARCH" = 'i486' ]; then
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index c012a42d..2da91370 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -20,7 +20,7 @@ eval "$(
 )"
 
 makedepends=(${makedepends[@]//xorg-server-xvfb/})
-makedepends_i686=(xorg-server-xvfb)
+makedepends_i686+=(xorg-server-xvfb)
 
 # skip xvfb stuff on i486
 if [ "$CARCH" = 'i486' ]; then
diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD
index 5459bf68..4c9c9195 100644
--- a/extra/qt5-base/PKGBUILD
+++ b/extra/qt5-base/PKGBUILD
@@ -6,7 +6,7 @@ eval "$(
 )"
 
 makedepends=(${makedepends[@]/vulkan-headers/})
-makedepends_i686=(vulkan-headers)
+makedepends_i686+=(vulkan-headers)
 if [ "$CARCH" = 'i486' ]; then
   eval "$(
     declare -f build | \
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 941792d7..da86150e 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,17 +1,25 @@
+# no Java bindings on i486
+makedepends=(${makedepends[@]//java-environment<10/})
+makedepends_i686+=(java-environment<10)
+
+# no Ruby bindings on i486
+makedepends=(${makedepends[@]//ruby/})
+checkdepends=(${checkdepends[@]//ruby-test-unit/})
+makedepends_i686+=(ruby)
+checkdepends_i686+=(ruby-test-unit)
+
+# no KDE gui on i486
+makedepends=(${makedepends[@]//kdelibs4support/})
+makedepends=(${makedepends[@]//kwallet/})
+makedepends_i686+=(kdelibs4support kwallet)
+
+# no Gnome gui on i486
+makedepends=(${makedepends[@]//libgnome-keyring/})
+makedepends_i686+=(libgnome-keyring)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
-  # no Apache server integration
-  makedepends=(${makedepends[@]//apache/})
-  eval "$(
-    declare -f build | \
-      sed '
-        s@--with-apxs@@
-        s@--with-apache-libexecdir=/usr/lib/httpd/modules@@
-      '
-  )"
-
   # no Java bindings
-  makedepends=(${makedepends[@]//java-environment<10/})
   eval "$(
     declare -f build | \
       sed '
@@ -28,8 +36,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no Ruby bindings
-  makedepends=(${makedepends[@]//ruby/})
-  checkdepends=(${checkdepends[@]//ruby-test-unit/})
   eval "$(
     declare -f build | \
       sed '
@@ -51,8 +57,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no KDE gui
-  makedepends=(${makedepends[@]//kdelibs4support/})
-  makedepends=(${makedepends[@]//kwallet/})
   eval "$(
     declare -f build | \
       sed '
@@ -61,7 +65,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no Gnome gui
-  makedepends=(${makedepends[@]//libgnome-keyring/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD
index e4e996bc..e2df8a75 100644
--- a/extra/wayland/PKGBUILD
+++ b/extra/wayland/PKGBUILD
@@ -1,10 +1,13 @@
+# no documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends=(${makedepends[@]//doxygen/})
+makedepends=(${makedepends[@]//xmlto/})
+makedepends=(${makedepends[@]//docbook-xsl/})
+makedepends_i686+=(graphviz doxygen xmlto docbook-xsl)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no documentation
-  makedepends=(${makedepends[@]//graphviz/})
-  makedepends=(${makedepends[@]//doxygen/})
-  makedepends=(${makedepends[@]//xmlto/})
-  makedepends=(${makedepends[@]//docbook-xsl/})
 
   eval "$(
     declare -f build | \
diff --git a/multilib/fasm/PKGBUILD b/multilib/fasm/PKGBUILD
index 895ff6c5..8dd79a3f 100644
--- a/multilib/fasm/PKGBUILD
+++ b/multilib/fasm/PKGBUILD
@@ -1,4 +1,4 @@
-depends_i686=('glibc')
+depends_i686+=('glibc')
 
 eval "$(
   declare -f build | \
-- 
cgit v1.2.3-70-g09d2