Date: Monday, July 29, 2013 @ 18:02:34 Author: lcarlier Revision: 94720
upgpkg: lib32-systemd 206-1 Sync with testing Modified: lib32-systemd/trunk/PKGBUILD Deleted: lib32-systemd/trunk/use-split-usr-path.patch --------------------------+ PKGBUILD | 16 +++------------- use-split-usr-path.patch | 14 -------------- 2 files changed, 3 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-07-29 13:10:04 UTC (rev 94719) +++ PKGBUILD 2013-07-29 16:02:34 UTC (rev 94720) @@ -4,7 +4,7 @@ pkgname=lib32-systemd _pkgbasename=systemd -pkgver=204 +pkgver=206 pkgrel=1 pkgdesc="system and service manager (32-bit)" arch=('x86_64') @@ -13,18 +13,9 @@ makedepends=('lib32-gcc-libs' 'gcc-multilib' 'lib32-dbus-core' 'lib32-libcap' 'lib32-acl' 'lib32-libgcrypt' 'lib32-glib2' 'lib32-xz' 'intltool' 'gperf') options=('!libtool') -source=("http://www.freedesktop.org/software/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz" - use-split-usr-path.patch) -md5sums=('a07619bb19f48164fbf0761d12fd39a8' - '76bf83fe34c5b40533abc5dc940576a6') +source=("http://www.freedesktop.org/software/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz") +md5sums=('89e36f2d3ba963020b72738549954cbc') -prepare() { - cd "${srcdir}/systemd-${pkgver}" - - # hang onto this until we do the /{,s}bin merge - patch -Np1 <"$srcdir/use-split-usr-path.patch" -} - build() { export CC="gcc -m32" export CXX="g++ -m32" @@ -33,7 +24,6 @@ cd "${srcdir}/systemd-${pkgver}" ./configure \ - --enable-static \ --libexecdir=/usr/lib32 \ --libdir=/usr/lib32 \ --localstatedir=/var \ Deleted: use-split-usr-path.patch =================================================================== --- use-split-usr-path.patch 2013-07-29 13:10:04 UTC (rev 94719) +++ use-split-usr-path.patch 2013-07-29 16:02:34 UTC (rev 94720) @@ -1,14 +0,0 @@ ---- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 -+++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 -@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) { - - /* Set up PATH unless it is already set */ - setenv("PATH", --#ifdef HAVE_SPLIT_USR - "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", --#else -- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", --#endif - arg_running_as == SYSTEMD_SYSTEM); - - if (arg_running_as == SYSTEMD_SYSTEM) {