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

Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/pkgconfig/files: pkgconfig-0.28-lfs.patch
Date: Sun, 31 May 2015 21:03:56
Message-Id: 20150531210349.6DD41A18@oystercatcher.gentoo.org
1 tetromino 15/05/31 21:03:49
2
3 Modified: pkgconfig-0.28-lfs.patch
4 Log:
5 We cannot use autotools.eclass in pkgconfig, it creates a circular dependency (bug #550856, thanks to Fabian Groffen, Mike Gilbert).
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
8
9 Revision Changes Path
10 1.2 dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch?r1=1.1&r2=1.2
15
16 Index: pkgconfig-0.28-lfs.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- pkgconfig-0.28-lfs.patch 27 May 2015 04:35:41 -0000 1.1
23 +++ pkgconfig-0.28-lfs.patch 31 May 2015 21:03:49 -0000 1.2
24 @@ -1,4 +1,4 @@
25 -From 40342dd0ead05d457a2a4e692cf865f50033a709 Mon Sep 17 00:00:00 2001
26 +From 217ffa021257fc2313c9eeb3e94e2ee38d255634 Mon Sep 17 00:00:00 2001
27 From: Peter Jones <pjones@××××××.com>
28 Date: Wed, 15 Apr 2015 12:25:29 -0400
29 Subject: [PATCH] Enable large file support
30 @@ -6,15 +6,20 @@
31 https://bugs.freedesktop.org/show_bug.cgi?id=90078
32
33 Signed-off-by: Peter Jones <pjones@××××××.com>
34 +
35 +[Alexandre Rostovtsev <tetromino@g.o>: expand out configure,
36 + config.h.in modifications.]
37 ---
38 - configure.ac | 3 +++
39 - 1 file changed, 3 insertions(+)
40 + configure.ac | 3 +
41 + config.h.in | 11 ++++
42 + configure | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
43 + 3 files changed, 217 insertions(+)
44
45 diff --git a/configure.ac b/configure.ac
46 -index b807251..388c013 100644
47 +index 2b33371..1a321e1 100644
48 --- a/configure.ac
49 +++ b/configure.ac
50 -@@ -29,6 +29,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1
51 +@@ -17,6 +17,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1
52 dnl to make
53 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
54
55 @@ -24,6 +29,253 @@
56 dnl Check for programs
57 AC_PROG_CC
58 AC_CHECK_PROG([LN], [ln], [ln], [cp -Rp])
59 +diff --git a/config.h.in b/config.h.in
60 +index 0aac8f3..fdae454 100644
61 +--- a/config.h.in
62 ++++ b/config.h.in
63 +@@ -72,3 +72,14 @@
64 +
65 + /* Version number of package */
66 + #undef VERSION
67 ++
68 ++/* Enable large inode numbers on Mac OS X 10.5. */
69 ++#ifndef _DARWIN_USE_64_BIT_INODE
70 ++# define _DARWIN_USE_64_BIT_INODE 1
71 ++#endif
72 ++
73 ++/* Number of bits in a file offset, on hosts where this is settable. */
74 ++#undef _FILE_OFFSET_BITS
75 ++
76 ++/* Define for large files, on AIX-style hosts. */
77 ++#undef _LARGE_FILES
78 +diff --git a/configure b/configure
79 +index 160ecab..f897e22 100755
80 +--- a/configure
81 ++++ b/configure
82 +@@ -783,6 +783,7 @@ with_gnu_ld
83 + with_sysroot
84 + enable_libtool_lock
85 + enable_silent_rules
86 ++enable_largefile
87 + with_pc_path
88 + with_system_include_path
89 + with_system_library_path
90 +@@ -1435,6 +1436,7 @@ Optional Features:
91 + --disable-libtool-lock avoid locking (might break parallel builds)
92 + --enable-silent-rules less verbose build output (undo: "make V=1")
93 + --disable-silent-rules verbose build output (undo: "make V=0")
94 ++ --disable-largefile omit support for large files
95 + --enable-indirect-deps list both direct and indirect dependencies.
96 + --disable-indirect-deps only list direct dependencies.
97 + default=auto
98 +@@ -11389,6 +11391,207 @@ fi
99 + AM_BACKSLASH='\'
100 +
101 +
102 ++# Check whether --enable-largefile was given.
103 ++if test "${enable_largefile+set}" = set; then :
104 ++ enableval=$enable_largefile;
105 ++fi
106 ++
107 ++if test "$enable_largefile" != no; then
108 ++
109 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
110 ++$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
111 ++if ${ac_cv_sys_largefile_CC+:} false; then :
112 ++ $as_echo_n "(cached) " >&6
113 ++else
114 ++ ac_cv_sys_largefile_CC=no
115 ++ if test "$GCC" != yes; then
116 ++ ac_save_CC=$CC
117 ++ while :; do
118 ++ # IRIX 6.2 and later do not support large files by default,
119 ++ # so use the C compiler's -n32 option if that helps.
120 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
121 ++/* end confdefs.h. */
122 ++#include <sys/types.h>
123 ++ /* Check that off_t can represent 2**63 - 1 correctly.
124 ++ We can't simply define LARGE_OFF_T to be 9223372036854775807,
125 ++ since some C++ compilers masquerading as C compilers
126 ++ incorrectly reject 9223372036854775807. */
127 ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
128 ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
129 ++ && LARGE_OFF_T % 2147483647 == 1)
130 ++ ? 1 : -1];
131 ++int
132 ++main ()
133 ++{
134 ++
135 ++ ;
136 ++ return 0;
137 ++}
138 ++_ACEOF
139 ++ if ac_fn_c_try_compile "$LINENO"; then :
140 ++ break
141 ++fi
142 ++rm -f core conftest.err conftest.$ac_objext
143 ++ CC="$CC -n32"
144 ++ if ac_fn_c_try_compile "$LINENO"; then :
145 ++ ac_cv_sys_largefile_CC=' -n32'; break
146 ++fi
147 ++rm -f core conftest.err conftest.$ac_objext
148 ++ break
149 ++ done
150 ++ CC=$ac_save_CC
151 ++ rm -f conftest.$ac_ext
152 ++ fi
153 ++fi
154 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
155 ++$as_echo "$ac_cv_sys_largefile_CC" >&6; }
156 ++ if test "$ac_cv_sys_largefile_CC" != no; then
157 ++ CC=$CC$ac_cv_sys_largefile_CC
158 ++ fi
159 ++
160 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
161 ++$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
162 ++if ${ac_cv_sys_file_offset_bits+:} false; then :
163 ++ $as_echo_n "(cached) " >&6
164 ++else
165 ++ while :; do
166 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
167 ++/* end confdefs.h. */
168 ++#include <sys/types.h>
169 ++ /* Check that off_t can represent 2**63 - 1 correctly.
170 ++ We can't simply define LARGE_OFF_T to be 9223372036854775807,
171 ++ since some C++ compilers masquerading as C compilers
172 ++ incorrectly reject 9223372036854775807. */
173 ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
174 ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
175 ++ && LARGE_OFF_T % 2147483647 == 1)
176 ++ ? 1 : -1];
177 ++int
178 ++main ()
179 ++{
180 ++
181 ++ ;
182 ++ return 0;
183 ++}
184 ++_ACEOF
185 ++if ac_fn_c_try_compile "$LINENO"; then :
186 ++ ac_cv_sys_file_offset_bits=no; break
187 ++fi
188 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
189 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
190 ++/* end confdefs.h. */
191 ++#define _FILE_OFFSET_BITS 64
192 ++#include <sys/types.h>
193 ++ /* Check that off_t can represent 2**63 - 1 correctly.
194 ++ We can't simply define LARGE_OFF_T to be 9223372036854775807,
195 ++ since some C++ compilers masquerading as C compilers
196 ++ incorrectly reject 9223372036854775807. */
197 ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
198 ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
199 ++ && LARGE_OFF_T % 2147483647 == 1)
200 ++ ? 1 : -1];
201 ++int
202 ++main ()
203 ++{
204 ++
205 ++ ;
206 ++ return 0;
207 ++}
208 ++_ACEOF
209 ++if ac_fn_c_try_compile "$LINENO"; then :
210 ++ ac_cv_sys_file_offset_bits=64; break
211 ++fi
212 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
213 ++ ac_cv_sys_file_offset_bits=unknown
214 ++ break
215 ++done
216 ++fi
217 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
218 ++$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
219 ++case $ac_cv_sys_file_offset_bits in #(
220 ++ no | unknown) ;;
221 ++ *)
222 ++cat >>confdefs.h <<_ACEOF
223 ++#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
224 ++_ACEOF
225 ++;;
226 ++esac
227 ++rm -rf conftest*
228 ++ if test $ac_cv_sys_file_offset_bits = unknown; then
229 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
230 ++$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
231 ++if ${ac_cv_sys_large_files+:} false; then :
232 ++ $as_echo_n "(cached) " >&6
233 ++else
234 ++ while :; do
235 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
236 ++/* end confdefs.h. */
237 ++#include <sys/types.h>
238 ++ /* Check that off_t can represent 2**63 - 1 correctly.
239 ++ We can't simply define LARGE_OFF_T to be 9223372036854775807,
240 ++ since some C++ compilers masquerading as C compilers
241 ++ incorrectly reject 9223372036854775807. */
242 ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
243 ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
244 ++ && LARGE_OFF_T % 2147483647 == 1)
245 ++ ? 1 : -1];
246 ++int
247 ++main ()
248 ++{
249 ++
250 ++ ;
251 ++ return 0;
252 ++}
253 ++_ACEOF
254 ++if ac_fn_c_try_compile "$LINENO"; then :
255 ++ ac_cv_sys_large_files=no; break
256 ++fi
257 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
258 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
259 ++/* end confdefs.h. */
260 ++#define _LARGE_FILES 1
261 ++#include <sys/types.h>
262 ++ /* Check that off_t can represent 2**63 - 1 correctly.
263 ++ We can't simply define LARGE_OFF_T to be 9223372036854775807,
264 ++ since some C++ compilers masquerading as C compilers
265 ++ incorrectly reject 9223372036854775807. */
266 ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
267 ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
268 ++ && LARGE_OFF_T % 2147483647 == 1)
269 ++ ? 1 : -1];
270 ++int
271 ++main ()
272 ++{
273 ++
274 ++ ;
275 ++ return 0;
276 ++}
277 ++_ACEOF
278 ++if ac_fn_c_try_compile "$LINENO"; then :
279 ++ ac_cv_sys_large_files=1; break
280 ++fi
281 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
282 ++ ac_cv_sys_large_files=unknown
283 ++ break
284 ++done
285 ++fi
286 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
287 ++$as_echo "$ac_cv_sys_large_files" >&6; }
288 ++case $ac_cv_sys_large_files in #(
289 ++ no | unknown) ;;
290 ++ *)
291 ++cat >>confdefs.h <<_ACEOF
292 ++#define _LARGE_FILES $ac_cv_sys_large_files
293 ++_ACEOF
294 ++;;
295 ++esac
296 ++rm -rf conftest*
297 ++ fi
298 ++
299 ++
300 ++fi
301 ++
302 ++
303 + ac_ext=c
304 + ac_cpp='$CPP $CPPFLAGS'
305 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
306 --
307 -2.4.1
308 +2.4.2
Report Message
Find on MARC Find on Google Groups