Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd/files: 208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch 208-0002-Update-Makefile.in.patch
Date: Wed, 02 Oct 2013 09:11:54
Message-Id: 20131002091149.DB2482004C@flycatcher.gentoo.org
1 mgorny 13/10/02 09:11:49
2
3 Added:
4 208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch
5 208-0002-Update-Makefile.in.patch
6 Log:
7 Version bump. Fix linking issues, bug #479038.
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
10
11 Revision Changes Path
12 1.1 sys-apps/systemd/files/208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch?rev=1.1&content-type=text/plain
16
17 Index: 208-0001-Work-around-link-libsystemd-label-to-libsystemd-logi.patch
18 ===================================================================
19 From c0b3a7fbf668320f7710c85c8e9799ad3722300c Mon Sep 17 00:00:00 2001
20 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
21 Date: Wed, 2 Oct 2013 10:08:33 +0200
22 Subject: [PATCH] Work-around: link libsystemd-label to libsystemd-login.
23
24 This has been fixed upstream by moving the code around but adding
25 the linking gives much less patching.
26 ---
27 Makefile.am | 1 +
28 1 file changed, 1 insertion(+)
29
30 diff --git a/Makefile.am b/Makefile.am
31 index 8d9c587..dc85ac3 100644
32 --- a/Makefile.am
33 +++ b/Makefile.am
34 @@ -3918,6 +3918,7 @@ libsystemd_login_la_LDFLAGS = \
35 libsystemd_login_la_LIBADD = \
36 libsystemd-shared.la \
37 libsystemd-daemon-internal.la \
38 + libsystemd-label.la \
39 $(RT_LIBS)
40
41 libsystemd_login_internal_la_SOURCES = \
42 --
43 1.8.3.2
44
45
46
47
48 1.1 sys-apps/systemd/files/208-0002-Update-Makefile.in.patch
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/208-0002-Update-Makefile.in.patch?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/208-0002-Update-Makefile.in.patch?rev=1.1&content-type=text/plain
52
53 Index: 208-0002-Update-Makefile.in.patch
54 ===================================================================
55 From 74f96de2cdf89c75f1a619364d90c787ec63d2f5 Mon Sep 17 00:00:00 2001
56 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
57 Date: Wed, 2 Oct 2013 10:23:49 +0200
58 Subject: [PATCH] Update Makefile.in.
59
60 ---
61 Makefile.in | 3 ++-
62 1 file changed, 2 insertions(+), 1 deletion(-)
63
64 diff --git a/Makefile.in b/Makefile.in
65 index f0b7893..02bd630 100644
66 --- a/Makefile.in
67 +++ b/Makefile.in
68 @@ -1422,7 +1422,7 @@ libsystemd_login_internal_la_OBJECTS = \
69 @ENABLE_LOGIND_TRUE@libsystemd_login_la_DEPENDENCIES = \
70 @ENABLE_LOGIND_TRUE@ libsystemd-shared.la \
71 @ENABLE_LOGIND_TRUE@ libsystemd-daemon-internal.la \
72 -@ENABLE_LOGIND_TRUE@ $(am__DEPENDENCIES_1)
73 +@ENABLE_LOGIND_TRUE@ libsystemd-label.la $(am__DEPENDENCIES_1)
74 am__libsystemd_login_la_SOURCES_DIST = src/login/sd-login.c \
75 src/systemd/sd-login.h src/login/login-shared.c \
76 src/login/login-shared.h
77 @@ -6096,6 +6096,7 @@ dist_catalog_DATA = \
78 @ENABLE_LOGIND_TRUE@libsystemd_login_la_LIBADD = \
79 @ENABLE_LOGIND_TRUE@ libsystemd-shared.la \
80 @ENABLE_LOGIND_TRUE@ libsystemd-daemon-internal.la \
81 +@ENABLE_LOGIND_TRUE@ libsystemd-label.la \
82 @ENABLE_LOGIND_TRUE@ $(RT_LIBS)
83
84 @ENABLE_LOGIND_TRUE@libsystemd_login_internal_la_SOURCES = \
85 --
86 1.8.3.2