diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-14 22:51:39 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-14 23:08:10 -0400 |
| commit | b83bc69b9f43b60d893db70cf83a7a7b381553d4 (patch) | |
| tree | cc3da70db9372a2fe5e1b24664586e10761b47bc /libre | |
| parent | 61dbc6240c0d556c8e13337b1f58d6c5dca01198 (diff) | |
| download | abslibre-b83bc69b9f43b60d893db70cf83a7a7b381553d4.tar.gz abslibre-b83bc69b9f43b60d893db70cf83a7a7b381553d4.tar.bz2 abslibre-b83bc69b9f43b60d893db70cf83a7a7b381553d4.zip | |
libre/systemd: Fiddle with depends/provides, fix build on glibc 2.28
1. Use pkgrel when depending on systemd-common=...
2. systemd-resolvconf: Don't depend on systemd-common, it's only symlinks.
3. systemd-resolvconf: Don't provide 'resolvconf'. I had included
https://git.archlinux.org/svntogit/packages.git/commit/?h=packages/systemd&id=25987557c0889a54ed5baf0f39b874070e21d894
in my work. That commit is not yet in the repos in Arch, and with
netctl 1.18 it causes an ambiguity in 'base' in Parabola.
4. Backport a commit to fix errors building with glibc 2.28
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/systemd/PKGBUILD | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index e90f6e9ae..d0e559ff4 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -14,7 +14,7 @@ pkgname+=("${_libsystemd[@]/#/systemd-}") _commit='de7436b02badc82200dc127ff190b8155769b8e7' pkgver=239.0 pkgrel=2 -pkgrel+=.parabola6 +pkgrel+=.parabola7 arch=('x86_64') arch+=('i686' 'armv7h') url='https://www.github.com/systemd/systemd' @@ -87,6 +87,7 @@ sha512sums=('SKIP' '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( + '75720bff62a84896e9a0654afc7cf9408cf89a38' # (for glibc 2.28) build-sys: Detect whether struct statx is defined in sys/stat.h ) _reverts=( @@ -220,7 +221,7 @@ package_systemd() { depends=('bash' 'dbus' 'kbd' 'kmod' 'libsystemd' 'pam' 'libelf' 'util-linux' 'pcre2') - depends+=("systemd-common=$pkgver" 'udev') + depends+=("systemd-common=$pkgver-$pkgrel" 'udev') provides=("systemd-tools=$pkgver") replaces=('systemd-tools') conflicts=('systemd-tools') @@ -306,7 +307,7 @@ package_systemd-udev() { pkgdesc='Userspace device file manager' license=('GPL2') # NB: different than the rest groups=('base' 'base-devel') - depends=("systemd-common=$pkgver" 'systemd-libudev' + depends=("systemd-common=$pkgver-$pkgrel" 'systemd-libudev' 'hwids' 'kmod' 'util-linux' 'zlib') backup=(etc/udev/udev.conf) @@ -409,8 +410,8 @@ package_systemd-nss-resolve() { package_systemd-resolvconf() { pkgdesc='systemd resolvconf replacement' license=('LGPL2.1') - depends=('systemd' "systemd-common=$pkgver") - provides=('openresolv' 'resolvconf') + depends=('systemd') + provides=('openresolv') conflicts=('openresolv') replaces+=('notsystemd-resolvconf') # notsystemd-resolvconf should have never existed |