diff options
| author | Erich Eckner <git@eckner.net> | 2018-09-14 15:26:28 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-09-14 15:26:28 +0200 |
| commit | 132760a66d006c23ba9537245b0c323910fc03ca (patch) | |
| tree | d202fb2c2ae84a6f7a8d275427ae09a37eae4e66 | |
| parent | 60f8c1c10853cb718003c8aeee723460731a9813 (diff) | |
| parent | 635e76fd7606e21486928e6a3ea9a030dbf87493 (diff) | |
| download | packages-132760a66d006c23ba9537245b0c323910fc03ca.tar.xz | |
Merge branch 'master' into i486
| -rw-r--r-- | extra-from-multilib | 1 | ||||
| -rw-r--r-- | extra/libatomic_ops/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/mariadb/PKGBUILD | 22 |
3 files changed, 22 insertions, 26 deletions
diff --git a/extra-from-multilib b/extra-from-multilib deleted file mode 100644 index b631e5c3..00000000 --- a/extra-from-multilib +++ /dev/null @@ -1 +0,0 @@ -cmucl diff --git a/extra/libatomic_ops/PKGBUILD b/extra/libatomic_ops/PKGBUILD index cb18a7d9..b02be16c 100644 --- a/extra/libatomic_ops/PKGBUILD +++ b/extra/libatomic_ops/PKGBUILD @@ -1,15 +1,12 @@ -# i486-specific -if [ "${CARCH}" = "i486" ]; then - # missing a -latomic when linking tests - source+=('libatomic_ops-7.6.4-libatomic.patch') - sha256sums+=('9309b11f4794c14c09f49df21aa9adb9e490db1d0bffa707af0a36db40e950cc') +# missing a -latomic when linking tests +source+=('libatomic_ops-7.6.4-libatomic.patch') +sha256sums+=('9309b11f4794c14c09f49df21aa9adb9e490db1d0bffa707af0a36db40e950cc') - eval "$( - declare -f prepare | \ - sed ' - /}/ i \ - patch -Np1 -i "$srcdir/libatomic_ops-7.6.4-libatomic.patch" \ - autoreconf - ' - )" -fi +eval "$( + declare -f prepare | \ + sed ' + /}/ i \ + patch -Np1 -i "$srcdir/libatomic_ops-7.6.4-libatomic.patch" \ + autoreconf + ' +)" diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index f92fe1d3..3f6a4f9c 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,3 +1,14 @@ +# add -latomic where needed +# e.g.TARGET_LINK_LIBRARIES(mariabackup sql crc atomic) +source+=('mariadb-10.1.32-atomic.patch') +sha256sums+=('194e43ca5468d4f4634f45eed6aaf08865c2d351fcc500696d4dc578fe94902e') +eval "$( + declare -f prepare | \ + sed ' + /patch -Np1.*openssl-1-1-0.patch/ a \ patch -Np1 -i "${srcdir}/mariadb-10.1.32-atomic.patch" + ' +)" + # 486-specific if [ "${CARCH}" = "i486" ]; then # no java @@ -7,15 +18,4 @@ if [ "${CARCH}" = "i486" ]; then s/cmake /cmake -DCONNECT_WITH_JDBC=0 / ' )" - - # add -latomic where needed - # e.g.TARGET_LINK_LIBRARIES(mariabackup sql crc atomic) - source+=('mariadb-10.1.32-atomic.patch') - sha256sums+=('194e43ca5468d4f4634f45eed6aaf08865c2d351fcc500696d4dc578fe94902e') - eval "$( - declare -f prepare | \ - sed ' - /patch -Np1.*openssl-1-1-0.patch/ a \ patch -Np1 -i "${srcdir}/mariadb-10.1.32-atomic.patch" - ' - )" fi |