From patchwork Tue Jun 21 11:29:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ville_Skytt=C3=A4?= X-Patchwork-Id: 34747 Received: from localhost ([127.0.0.1] helo=www.linuxtv.org) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFJsQ-0002Sv-4c; Tue, 21 Jun 2016 11:29:54 +0000 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFJsN-0002Sh-DM for vdr@linuxtv.org; Tue, 21 Jun 2016 11:29:52 +0000 X-tubIT-Incoming-IP: 209.85.217.172 Received: from mail-lb0-f172.google.com ([209.85.217.172]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-6) with esmtps [TLSv1.2:AES128-GCM-SHA256:128] for id 1bFJsL-0007ca-6F; Tue, 21 Jun 2016 13:29:51 +0200 Received: by mail-lb0-f172.google.com with SMTP id ak10so8652582lbc.3 for ; Tue, 21 Jun 2016 04:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=FyLCD1EbhiKBe1lFLjfDnzSy41tigM/K8ew8ZGapixk=; b=LqC5yL8474m04luhbkFvGyGR4ojPrCc2yKG0Gf0kmMsn6YAttKeJa16ubvZkahROyz 2i2f9aC+o1A2fuQ91ffME3jpriX8RHSwVKmhIk0CBWyUPegjvuhUT/mwSPdAGd9kmQlR q2KY6hr3O7jhPKrFtqFsfCGPrcYuFGk0mHYpSEAGDJG1vCW4zAO/xW+tb17q+u+i332m g0OX/kYeMc2l219JpZWRxOOh4GxU7+IndSBfyrGYt44Jh1vJzwYoEVhkdDvxPG5+jcVO B9GGN1+IJVPyoHTUYZn90uNvwcFR2x77f0aVWzhxzIn7atSgY/IKFHHKyTazoQiBF8t+ UEAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=FyLCD1EbhiKBe1lFLjfDnzSy41tigM/K8ew8ZGapixk=; b=DaEJ5z7C79DyF77C+hgs3h692oI3ibSTu8Jysjs7uqi17ONwRpEvV8p2fX0WG+6p9g wh/KawiP9h0vXhwBpS4v5s9c20JIj3EzVUx9V0YVa3qFWYj/qcpHCivPl+3ShxobX42F jtOo6fCKs3sd3FFqYBQ03iiL9ib95wI4G+BmhyfEIhb+AqJ5/B3WVaz/w17ZPEQCHrKY rinGEiA0XliO1kCFMkrZMzpERwC/BSr9M8JBeR6NlfBOriT4UQLDTleZ78dT0oIPSr32 x40wVS9wmUBYheiH7AwM9IDy7MphnRmeZ19PoNvbRdWl0yjtcsgWLo73qAZKBuFWttlZ Rkew== X-Gm-Message-State: ALyK8tKKTp2fxzd5YKbfVsP8t7VAmVDFoaX9O2ZoZN/ISzJdRQFzlGe1hdL+7D2oNCXfcQeb98e7jjd5hXZAJw== X-Received: by 10.194.67.101 with SMTP id m5mr20629765wjt.129.1466508589131; Tue, 21 Jun 2016 04:29:49 -0700 (PDT) MIME-Version: 1.0 Received: by 10.194.9.195 with HTTP; Tue, 21 Jun 2016 04:29:29 -0700 (PDT) In-Reply-To: <5769242A.5080808@astrali.lan> References: <5769242A.5080808@astrali.lan> From: =?UTF-8?Q?Ville_Skytt=C3=A4?= Date: Tue, 21 Jun 2016 14:29:29 +0300 X-Google-Sender-Auth: Wlqxs99epwbyThexsYW0j1EyO5U Message-ID: To: VDR Mailing List X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.6.21.112116 X-PMX-Spam: Gauge=XIII, Probability=13%, Report=' TO_IN_SUBJECT 0.5, WEBMAIL_REPLYTO_NOT_FROM 0.5, HTML_00_01 0.05, HTML_00_10 0.05, MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODYTEXTP_SIZE_400_LESS 0, BODY_SIZE_1900_1999 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CTYPE_MULTIPART_NO_QUOTE 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, MSG_THREAD 0, NO_URI_HTTPS 0, REFERENCES 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __DATE_TZ_RU 0, __DQ_NEG_HEUR 0, __DQ_NEG_IP 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_SENDER 0, __HAS_ATTACHMENT 0, __HAS_ATTACHMENT1 0, __HAS_FROM 0, __HAS_MSGID 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __RDNS_GMAIL 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_NEGATE 0, __TO_IN_SUBJECT2 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' X-LSpam-Score: 1.3 (+) X-LSpam-Report: No, score=1.3 required=5.0 tests=FREEMAIL_FORGED_FROMDOMAIN=0.198, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.5, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, RDNS_NONE=1.274, T_DKIM_INVALID=0.01 autolearn=no autolearn_force=no Subject: Re: [vdr] vdr-2.2.0 fails on compile with systemd-230 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: VDR Mailing List Errors-To: vdr-bounces@linuxtv.org Sender: "vdr" On Tue, Jun 21, 2016 at 2:25 PM, Joerg Bornkessel wrote: > atached patch fix this problem. It however also most likely breaks things with systemd < 230. Attached is another approach I sent to Klaus last week, this one should be backwards compatible. From 0376d2e4adc38528c0cbdde759a56700bee95872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 17 Jun 2016 17:08:31 +0300 Subject: [PATCH] Fix build with systemd >= 230 libsystemd-daemon has been merged to libsystemd. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b90cbd2..9193cde 100644 --- a/Makefile +++ b/Makefile @@ -95,9 +95,9 @@ DEFINES += -DBIDI LIBS += $(shell pkg-config --libs fribidi) endif ifdef SDNOTIFY -INCLUDES += $(shell pkg-config --cflags libsystemd-daemon) +INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd) DEFINES += -DSDNOTIFY -LIBS += $(shell pkg-config --libs libsystemd-daemon) +LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd) endif LIRC_DEVICE ?= /var/run/lirc/lircd -- 2.5.5