diff options
Diffstat (limited to 'package/systemd')
| -rw-r--r-- | package/systemd/Makefile | 13 | ||||
| -rw-r--r-- | package/systemd/patches/patch-Makefile_am | 20 | ||||
| -rw-r--r-- | package/systemd/patches/patch-configure_ac | 12 |
3 files changed, 39 insertions, 6 deletions
diff --git a/package/systemd/Makefile b/package/systemd/Makefile index 52c45504f..030515f28 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -5,12 +5,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= systemd PKG_VERSION:= 208 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= df64550d92afbffb4f67a434193ee165 PKG_DESCR:= System and Service Manager PKG_SECTION:= utils PKG_DEPENDS:= libblkid libcap -PKG_BUILDDEP:= usbutils glib kmod util-linux libcap +PKG_BUILDDEP:= autotool usbutils glib kmod util-linux libcap +PKG_BUILDDEP+= libgcrypt PKG_URL:= http://freedesktop.org/wiki/Software/systemd/ PKG_SITES:= http://www.freedesktop.org/software/systemd/ PKG_LIBNAME:= libudev @@ -33,12 +34,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -lrt -CONFIGURE_ARGS+= --disable-logging \ - --disable-static \ +CONFIGURE_ARGS+= --disable-static \ --without-python \ - --with-pci-ids-path=/usr/share/pci.ids \ - --disable-introspection + --disable-manpages \ + --disable-polkit udev-install: ${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am new file mode 100644 index 000000000..c35e6d461 --- /dev/null +++ b/package/systemd/patches/patch-Makefile_am @@ -0,0 +1,20 @@ +--- systemd-208.orig/Makefile.am 2013-10-02 04:57:09.000000000 +0200 ++++ systemd-208/Makefile.am 2013-12-14 16:18:32.000000000 +0100 +@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + AM_MAKEFLAGS = --no-print-directory + AUTOMAKE_OPTIONS = color-tests parallel-tests + +-SUBDIRS = . po ++SUBDIRS = . + + # remove targets if the command fails + .DELETE_ON_ERROR: +@@ -537,8 +537,6 @@ dist_doc_DATA = \ + LICENSE.MIT \ + DISTRO_PORTING + +-@INTLTOOL_POLICY_RULE@ +- + # ------------------------------------------------------------------------------ + + MANPAGES = diff --git a/package/systemd/patches/patch-configure_ac b/package/systemd/patches/patch-configure_ac new file mode 100644 index 000000000..e3aeaa5c0 --- /dev/null +++ b/package/systemd/patches/patch-configure_ac @@ -0,0 +1,12 @@ +--- systemd-208.orig/configure.ac 2013-10-02 01:54:26.000000000 +0200 ++++ systemd-208/configure.ac 2013-12-13 16:37:55.000000000 +0100 +@@ -47,9 +47,6 @@ LT_INIT([disable-static]) + AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])]) + AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])]) + +-# i18n stuff for the PolicyKit policy files +-IT_PROG_INTLTOOL([0.40.0]) +- + GETTEXT_PACKAGE=systemd + AC_SUBST(GETTEXT_PACKAGE) + |