[arch-commits] Commit in lib32-systemd/repos (3 files)

[Laurent Carlier]

    Date: Thursday, March 28, 2013 @ 17:11:00
  Author: lcarlier
Revision: 87212

archrelease: copy trunk to multilib-testing-x86_64

Added:
  lib32-systemd/repos/multilib-testing-x86_64/
  lib32-systemd/repos/multilib-testing-x86_64/PKGBUILD
    (from rev 87211, lib32-systemd/trunk/PKGBUILD)
  lib32-systemd/repos/multilib-testing-x86_64/use-split-usr-path.patch
    (from rev 87211, lib32-systemd/trunk/use-split-usr-path.patch)

--------------------------+
 PKGBUILD                 |   60 +++++++++++++++++++++++++++++++++++++++++++++
 use-split-usr-path.patch |   14 ++++++++++
 2 files changed, 74 insertions(+)

Copied: lib32-systemd/repos/multilib-testing-x86_64/PKGBUILD (from rev 87211, lib32-systemd/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-testing-x86_64/PKGBUILD	2013-03-28 16:11:00 UTC (rev 87212)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+
+pkgname=lib32-systemd
+_pkgbasename=systemd
+pkgver=199
+pkgrel=1
+pkgdesc="system and service manager (32-bit)"
+arch=('x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2' 'LGPL2.1' 'MIT')
+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=('4bb13f84ce211e93f0141774a90a2322')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/systemd-${pkgver}"
+
+  # hang onto this until we do the /{,s}bin merge
+  patch -Np1 <"$srcdir/use-split-usr-path.patch"
+
+  ./configure \
+    --enable-static \
+    --libexecdir=/usr/lib32 \
+    --libdir=/usr/lib32 \
+    --localstatedir=/var \
+    --sysconfdir=/etc \
+    --disable-audit \
+    --disable-ima \
+    --disable-pam \
+    --disable-kmod \
+    --disable-blkid \
+    --without-python \
+    --disable-libcryptsetup \
+    --with-sysvinit-path= \
+    --with-sysvrcnd-path=
+
+  make
+}
+
+package() {
+  depends=('lib32-glib2' 'lib32-libgcrypt' 'lib32-xz' 'systemd')
+  cd "${srcdir}/systemd-${pkgver}"
+    
+  make DESTDIR="$pkgdir" install
+    
+  rm -rf "${pkgdir}"/{etc,var}
+  rm -rf "${pkgdir}"/usr/{bin,include,lib,share}
+  rm -rf "${pkgdir}"/usr/lib32/libnss*
+}
+md5sums=('4bb13f84ce211e93f0141774a90a2322'
+         '76bf83fe34c5b40533abc5dc940576a6')

Copied: lib32-systemd/repos/multilib-testing-x86_64/use-split-usr-path.patch (from rev 87211, lib32-systemd/trunk/use-split-usr-path.patch)
===================================================================
--- multilib-testing-x86_64/use-split-usr-path.patch	                        (rev 0)
+++ multilib-testing-x86_64/use-split-usr-path.patch	2013-03-28 16:11:00 UTC (rev 87212)
@@ -0,0 +1,14 @@
+--- 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) {