Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libX11: libX11-1.6.2.ebuild libX11-1.6.3.ebuild ChangeLog
Date: Thu, 23 Jul 2015 03:43:33
Message-Id: 20150723034325.ADD52BB@oystercatcher.gentoo.org
1 vapier 15/07/23 03:43:25
2
3 Modified: libX11-1.6.2.ebuild libX11-1.6.3.ebuild ChangeLog
4 Log:
5 Fix cross-compiling logic with the makekeys tool by using the proper env vars.
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.15 x11-libs/libX11/libX11-1.6.2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild?rev=1.15&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild?rev=1.15&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild?r1=1.14&r2=1.15
15
16 Index: libX11-1.6.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v
19 retrieving revision 1.14
20 retrieving revision 1.15
21 diff -u -r1.14 -r1.15
22 --- libX11-1.6.2.ebuild 22 Feb 2015 02:21:24 -0000 1.14
23 +++ libX11-1.6.2.ebuild 23 Jul 2015 03:43:25 -0000 1.15
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2015 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.14 2015/02/22 02:21:24 mattst88 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.15 2015/07/23 03:43:25 vapier Exp $
29
30 EAPI=5
31
32 @@ -8,7 +8,7 @@
33 # needs automake-1.14 without eautoreconf
34 XORG_EAUTORECONF=yes
35 XORG_MULTILIB=yes
36 -inherit xorg-2 toolchain-funcs flag-o-matic
37 +inherit xorg-2 toolchain-funcs
38
39 DESCRIPTION="X.Org X11 library"
40
41 @@ -44,16 +44,14 @@
42 }
43
44 multilib_src_compile() {
45 - # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
46 if tc-is-cross-compiler; then
47 - (
48 - filter-flags -m*
49 - emake -C src/util \
50 - CC=$(tc-getBUILD_CC) \
51 - CFLAGS="${CFLAGS}" \
52 - LDFLAGS="" \
53 - clean all || die
54 - )
55 + # Make sure the build-time tool "makekeys" uses build settings.
56 + tc-export_build_env BUILD_CC
57 + emake -C src/util \
58 + CC="${BUILD_CC}" \
59 + CFLAGS="${BUILD_CFLAGS}" \
60 + LDFLAGS="${BUILD_LDFLAGS}" \
61 + clean all
62 fi
63
64 default
65
66
67
68 1.2 x11-libs/libX11/libX11-1.6.3.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild?rev=1.2&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild?rev=1.2&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild?r1=1.1&r2=1.2
73
74 Index: libX11-1.6.3.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild,v
77 retrieving revision 1.1
78 retrieving revision 1.2
79 diff -u -r1.1 -r1.2
80 --- libX11-1.6.3.ebuild 11 Mar 2015 00:30:30 -0000 1.1
81 +++ libX11-1.6.3.ebuild 23 Jul 2015 03:43:25 -0000 1.2
82 @@ -1,6 +1,6 @@
83 # Copyright 1999-2015 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild,v 1.1 2015/03/11 00:30:30 mattst88 Exp $
86 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild,v 1.2 2015/07/23 03:43:25 vapier Exp $
87
88 EAPI=5
89
90 @@ -8,7 +8,7 @@
91 # needs automake-1.14 without eautoreconf
92 XORG_EAUTORECONF=yes
93 XORG_MULTILIB=yes
94 -inherit xorg-2 toolchain-funcs flag-o-matic
95 +inherit xorg-2 toolchain-funcs
96
97 DESCRIPTION="X.Org X11 library"
98
99 @@ -44,16 +44,14 @@
100 }
101
102 multilib_src_compile() {
103 - # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
104 if tc-is-cross-compiler; then
105 - (
106 - filter-flags -m*
107 - emake -C src/util \
108 - CC=$(tc-getBUILD_CC) \
109 - CFLAGS="${CFLAGS}" \
110 - LDFLAGS="" \
111 - clean all || die
112 - )
113 + # Make sure the build-time tool "makekeys" uses build settings.
114 + tc-export_build_env BUILD_CC
115 + emake -C src/util \
116 + CC="${BUILD_CC}" \
117 + CFLAGS="${BUILD_CFLAGS}" \
118 + LDFLAGS="${BUILD_LDFLAGS}" \
119 + clean all
120 fi
121
122 default
123
124
125
126 1.224 x11-libs/libX11/ChangeLog
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?rev=1.224&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?rev=1.224&content-type=text/plain
130 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?r1=1.223&r2=1.224
131
132 Index: ChangeLog
133 ===================================================================
134 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v
135 retrieving revision 1.223
136 retrieving revision 1.224
137 diff -u -r1.223 -r1.224
138 --- ChangeLog 11 Mar 2015 00:30:30 -0000 1.223
139 +++ ChangeLog 23 Jul 2015 03:43:25 -0000 1.224
140 @@ -1,6 +1,10 @@
141 # ChangeLog for x11-libs/libX11
142 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
143 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.223 2015/03/11 00:30:30 mattst88 Exp $
144 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.224 2015/07/23 03:43:25 vapier Exp $
145 +
146 + 23 Jul 2015; Mike Frysinger <vapier@g.o> libX11-1.6.2.ebuild,
147 + libX11-1.6.3.ebuild:
148 + Fix cross-compiling logic with the makekeys tool by using the proper env vars.
149
150 *libX11-1.6.3 (11 Mar 2015)
Report Message
Find on MARC Find on Google Groups