diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-06-09 11:59:43 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-06-09 11:59:43 +0200 |
commit | 2ced1ae461d0c13f6fe6719fc4a9bbc6485efd4b (patch) | |
tree | a7aeca39812726286524ccddbda45fb79fe2088a | |
parent | fad88a89dd2f3c9e86e489791d2063a7a82f4769 (diff) |
lxdm: fix autoconf build and add depends
-rw-r--r-- | recipes-lxde/lxdm/files/lxdm-configure-ac.patch | 11 | ||||
-rw-r--r-- | recipes-lxde/lxdm/lxdm_0.4.1.bb | 7 |
2 files changed, 17 insertions, 1 deletions
diff --git a/recipes-lxde/lxdm/files/lxdm-configure-ac.patch b/recipes-lxde/lxdm/files/lxdm-configure-ac.patch new file mode 100644 index 0000000..c9197b9 --- /dev/null +++ b/recipes-lxde/lxdm/files/lxdm-configure-ac.patch @@ -0,0 +1,11 @@ +--- lxdm-0.4.1/configure.ac~ 2014-04-30 17:20:10.000000000 +0200 ++++ lxdm-0.4.1/configure.ac 2014-04-30 17:58:10.553136640 +0200 +@@ -3,7 +3,7 @@ + + AC_PREREQ([2.63]) + AC_INIT([lxdm], [0.4.1], [http://lxde.org/]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) + + AC_CONFIG_SRCDIR([src/lxdm.c]) + AC_CONFIG_HEADERS([config.h]) diff --git a/recipes-lxde/lxdm/lxdm_0.4.1.bb b/recipes-lxde/lxdm/lxdm_0.4.1.bb index 0ff4703..50552e3 100644 --- a/recipes-lxde/lxdm/lxdm_0.4.1.bb +++ b/recipes-lxde/lxdm/lxdm_0.4.1.bb @@ -7,7 +7,7 @@ PR = "r4" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "gtk+ consolekit libxcb ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS += "virtual/libintl intltool-native iso-codes gtk+ consolekit libxcb ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "xinit" @@ -24,6 +24,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \ file://init \ file://missingAM_GLIB_GNU_GETTEXT.patch \ file://fix_event_check_bug_caused_cpu_100.patch \ + file://lxdm-configure-ac.patch \ " SRC_URI[md5sum] = "8da1cfc2be6dc9217c85a7cf51e1e821" SRC_URI[sha256sum] = "9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08" @@ -35,6 +36,10 @@ inherit autotools pkgconfig gettext update-rc.d INITSCRIPT_NAME = "lxdm" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." +do_configure_prepend() { + cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/ +} + do_install_append () { rm ${D}/${sysconfdir}/pam.d/lxdm install -d ${D}/${sysconfdir}/lxdm |