summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:03:01 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:03:01 +0100
commit6b98f5a19f2f93f145e1e5b5d1e79d6ff29620fe (patch)
tree345d5a7c3e110ecec0eeea15cbf5cb4d9fe310ff
parent43a901ea68bafb0dfe1818553ad131e3e36de1c4 (diff)
parent05268da81d030e81cf1bdc9293e2c218d525135f (diff)
downloadpackages-6b98f5a19f2f93f145e1e5b5d1e79d6ff29620fe.tar.xz
Merge branch 'master' into i486
-rw-r--r--blacklist1
-rw-r--r--community/ponyc/PKGBUILD5
-rw-r--r--core/glib2/PKGBUILD32
-rw-r--r--core/gpgme/PKGBUILD2
-rw-r--r--core/kmod/PKGBUILD11
-rw-r--r--core/libidn2/PKGBUILD3
-rw-r--r--core/libpsl/PKGBUILD11
-rw-r--r--core/p11-kit/PKGBUILD11
-rw-r--r--extra/js52/PKGBUILD (renamed from community/firefox-developer-edition/PKGBUILD)11
-rw-r--r--extra/linux-pae/PKGBUILD6
-rw-r--r--extra/linux-pae/config2
11 files changed, 18 insertions, 77 deletions
diff --git a/blacklist b/blacklist
index d18621d5..968c8aa8 100644
--- a/blacklist
+++ b/blacklist
@@ -3,6 +3,7 @@ i686 ceph # fails fatally in check() - see <a href="https://bugs.archlinux32.org
i686 cuda # cuda 9.0 is 64-bit only
i686 delve # currently no 32-bit support, see <a href="https://github.com/derekparker/delve/issues/20">upstream</a>
i686 dotnet-core # not available for 32-bit on linux, see <a href="https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.5-download.md">here</a>
+i686 firefox-developer-edition # llvm segfaults, virtual memory issues (blacklisting may be temporary)
i686 linux-hardened # not <a href="https://mirror.archlinux32.org/irc-logs/%23archlinux-ports/2017-06-28.html#04:04:01">really useful</a> on i686 + hard to maintain
i486 linux-pae # not useful - use i686 instead
i686 libretro-citra # do not build, see FS32#23
diff --git a/community/ponyc/PKGBUILD b/community/ponyc/PKGBUILD
index ded62ee4..036ee228 100644
--- a/community/ponyc/PKGBUILD
+++ b/community/ponyc/PKGBUILD
@@ -7,3 +7,8 @@ eval "$(
s|make |make default_pic=true|
'
)"
+
+# the compiler seems fine, but the test frameworks seems to break with
+# newer LLVM, for now, ignoring the tests:
+# https://github.com/ponylang/ponyc/issues/2875
+unset check
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/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index 121220d1..6fdb2a39 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,5 +1,5 @@
eval "$(
- declare -f package_python-gpgme package_python2-gpgme qgpgme | \
+ declare -f package_python-gpgme package_python2-gpgme package_qgpgme | \
sed '
/^\s*{\s*$/ a arch=('"$(
printf '%s\n' "${arch[@]}" | \
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
diff --git a/community/firefox-developer-edition/PKGBUILD b/extra/js52/PKGBUILD
index 5087c006..35be419c 100644
--- a/community/firefox-developer-edition/PKGBUILD
+++ b/extra/js52/PKGBUILD
@@ -1,13 +1,4 @@
-eval "$(
- declare -f build | \
- sed '
- /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk
- '
- declare -f prepare | \
- sed '
- $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"
- '
-)"
+# use our tarballer
for ((i=0; i<${#source[@]}; i++)); do
infos=$(
printf '%s\n' "${source[${i}]}" | \
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 85a3840a..2220cd5b 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,7 +4,7 @@
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux-pae # Build stock -ARCH kernel
-pkgver='4.18.13'
+pkgver='4.18.14'
_srcname=linux-${pkgver}
pkgrel='1'
arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('dc87a1c6b591cff9034197cdefafb74ee9e0a507fa1a0a1fde823fa99e389650'
+sha256sums=('36c6d1360db9eab40270db6d292c259dd34d3dc06049d64afe3e4cfafb8562d3'
'SKIP'
- '22c4f7797faf6d39c27e03225d715397f9b41ebe4b19486d44704d5d15d5acd9'
+ 'efd2fa313d1c457dfc4244c4c55261cb1bf361af242665539ce5308bc1791477'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index acaa82d1..89bb9a32 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.13-1 Kernel Configuration
+# Linux/x86 4.18.14-1 Kernel Configuration
#
#