diff options
| author |   Christopher Brannon <teiresias@gentoo.org> | 2014-03-03 19:00:09 +0000 |
|---|---|---|
| committer | Christopher Brannon <teiresias@gentoo.org> | 2014-03-03 19:00:09 +0000 |
| commit | 3a4740c01c1abb68ce897ac115fad098f06f4a21 (patch) | |
| tree | 544914764cbee19f00be163c501bb31c9cb8b72b /media-gfx/sane-backends | |
| parent | mask fma3 useflag and unmask on x86/amd64 (diff) | |
| download | gentoo-2-3a4740c01c1abb68ce897ac115fad098f06f4a21.tar.gz gentoo-2-3a4740c01c1abb68ce897ac115fad098f06f4a21.tar.bz2 gentoo-2-3a4740c01c1abb68ce897ac115fad098f06f4a21.zip | |
Fix build failures caused by an incorrect patch.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)
Diffstat (limited to 'media-gfx/sane-backends')
| -rw-r--r-- | media-gfx/sane-backends/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch | 33 |
2 files changed, 28 insertions, 11 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 0624b31c6bc4..84cc2fa3d668 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/sane-backends # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.243 2014/03/03 17:00:17 teiresias Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.244 2014/03/03 19:00:08 teiresias Exp $ + + 03 Mar 2014; Christopher Brannon <teiresias@gentoo.org> + files/sane-backends-1.0.24-systemd_pkgconfig.patch: + Fix build failures caused by an incorrect patch. 03 Mar 2014; Christopher Brannon <teiresias@gentoo.org> sane-backends-1.0.24-r1.ebuild: diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch index 2a75145ae4f4..2d36cfaeab56 100644 --- a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch +++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch @@ -1,24 +1,37 @@ diff --git a/configure.in b/configure.in -index 7413646..2c05265 100644 +index 7413646..66828fc 100644 --- a/configure.in +++ b/configure.in -@@ -347,17 +347,11 @@ dnl fi +@@ -347,21 +347,18 @@ dnl fi AC_ARG_WITH(systemd, AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@])) if test "x$with_systemd" != xno ; then - dnl added by llagendijk 12/7/2012 to detect systemd for saned - $as_echo_n "Checking for systemd..." - if test -e /usr/include/systemd/sd-daemon.h ; then -+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd libsystemd-daemon], have_systemd=yes, have_systemd=no) -+ if test "x$have_systemd" = xyes; then - AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) +- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) - have_systemd="yes" - SYSTEMD_LIBS=" -lsystemd-daemon" - AC_SUBST(SYSTEMD_LIBS) +- AC_SUBST(SYSTEMD_LIBS) - $as_echo "yes" - else +- else - have_systemd="no" - $as_echo "no" - if test "x$with_systemd" = xyes; then - AC_MSG_ERROR([Systemd support was requested but systemd was not found]) - fi +- if test "x$with_systemd" = xyes; then +- AC_MSG_ERROR([Systemd support was requested but systemd was not found]) +- fi ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd], have_systemd=yes, have_systemd=no) ++ if test "x$have_systemd" = xno; then ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon], have_systemd=yes, have_systemd=no) ++ fi ++ if test "x$have_systemd" = xyes; then ++ AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) ++ AC_SUBST(SYSTEMD_LIBS) ++ else ++ if test "x$with_systemd" = xyes; then ++ AC_MSG_ERROR([Systemd support was requested but systemd was not found]) + fi ++ fi + fi + + dnl *********** |