Attachment #404374 for bug #550856

View | Details | Raw Unified | Return to bug 550856
Collapse All | Expand All




# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
WANT_AUTOMAKE=1.12

inherit eutils flag-o-matic libtool multilib multilib-minimal

MY_P=pkg-config-${PV}



	# Large file support, fixed in git; requires eautoreconf; bug #550508
	epatch "${FILESDIR}"/${P}-lfs.patch
	# Avoid calling autoheader/automake.
	touch aclocal.m4 config.h.in Makefile.in

	epatch_user

	if [[ ${PV} == *9999* ]]; then
		eautoreconf
	else
		elibtoolize # Required for FreeMiNT wrt #333429
	fi
}

multilib_src_configure() {




-- 
2.4.1

--- a/config.h.in
+++ b/config.h.in
@@ -72,3 +72,14 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
--- a/configure
+++ b/configure
@@ -783,6 +783,7 @@
 with_sysroot
 enable_libtool_lock
 enable_silent_rules
+enable_largefile
 with_pc_path
 with_system_include_path
 with_system_library_path
@@ -1435,6 +1436,7 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --disable-largefile     omit support for large files
   --enable-indirect-deps  list both direct and indirect dependencies.
        --disable-indirect-deps only list direct dependencies.
     default=auto
@@ -11389,6 +11391,207 @@
 AM_BACKSLASH='\'
 
 
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+
+
+fi
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

Return to bug 550856

Lines 8-14 Link Here

(-)pkgconfig-0.28-r3.ebuild (-5 / +7 lines)
8	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13	8	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
9	WANT_AUTOMAKE=1.12	9	WANT_AUTOMAKE=1.12
10		10
11	inherit autotools eutils flag-o-matic libtool multilib multilib-minimal	11	inherit eutils flag-o-matic libtool multilib multilib-minimal
12		12
13	MY_P=pkg-config-${PV}	13	MY_P=pkg-config-${PV}
14		14
Lines 45-58 Link Here
45		45
46	# Large file support, fixed in git; requires eautoreconf; bug #550508	46	# Large file support, fixed in git; requires eautoreconf; bug #550508
47	epatch "${FILESDIR}"/${P}-lfs.patch	47	epatch "${FILESDIR}"/${P}-lfs.patch
		48	# Avoid calling autoheader/automake.
		49	touch aclocal.m4 config.h.in Makefile.in
48		50
49	epatch_user	51	epatch_user
50		52
51	#if [[ ${PV} == 9999 ]]; then	53	if [[ ${PV} == 9999 ]]; then
52	eautoreconf	54	eautoreconf
53	#else	55	else
54	# elibtoolize # Required for FreeMiNT wrt #333429	56	elibtoolize # Required for FreeMiNT wrt #333429
55	#fi	57	fi
56	}	58	}
57		59
58	multilib_src_configure() {	60	multilib_src_configure() {

Lines 27-29 Link Here

(-)files/pkgconfig-0.28-lfs.patch (+243 lines)
27	--	27	--
28	2.4.1	28	2.4.1
29		29
		30	--- a/config.h.in
		31	+++ b/config.h.in
		32	@@ -72,3 +72,14 @@
		33
		34	/* Version number of package */
		35	#undef VERSION
		36	+
		37	+/* Enable large inode numbers on Mac OS X 10.5. */
		38	+#ifndef _DARWIN_USE_64_BIT_INODE
		39	+# define _DARWIN_USE_64_BIT_INODE 1
		40	+#endif
		41	+
		42	+/* Number of bits in a file offset, on hosts where this is settable. */
		43	+#undef _FILE_OFFSET_BITS
		44	+
		45	+/* Define for large files, on AIX-style hosts. */
		46	+#undef _LARGE_FILES
		47	--- a/configure
		48	+++ b/configure
		49	@@ -783,6 +783,7 @@
		50	with_sysroot
		51	enable_libtool_lock
		52	enable_silent_rules
		53	+enable_largefile
		54	with_pc_path
		55	with_system_include_path
		56	with_system_library_path
		57	@@ -1435,6 +1436,7 @@
		58	--disable-libtool-lock avoid locking (might break parallel builds)
		59	--enable-silent-rules less verbose build output (undo: "make V=1")
		60	--disable-silent-rules verbose build output (undo: "make V=0")
		61	+ --disable-largefile omit support for large files
		62	--enable-indirect-deps list both direct and indirect dependencies.
		63	--disable-indirect-deps only list direct dependencies.
		64	default=auto
		65	@@ -11389,6 +11391,207 @@
		66	AM_BACKSLASH='\'
		67
		68
		69	+# Check whether --enable-largefile was given.
		70	+if test "${enable_largefile+set}" = set; then :
		71	+ enableval=$enable_largefile;
		72	+fi
		73	+
		74	+if test "$enable_largefile" != no; then
		75	+
		76	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
		77	+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
		78	+if ${ac_cv_sys_largefile_CC+:} false; then :
		79	+ $as_echo_n "(cached) " >&6
		80	+else
		81	+ ac_cv_sys_largefile_CC=no
		82	+ if test "$GCC" != yes; then
		83	+ ac_save_CC=$CC
		84	+ while :; do
		85	+ # IRIX 6.2 and later do not support large files by default,
		86	+ # so use the C compiler's -n32 option if that helps.
		87	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		88	+/* end confdefs.h. */
		89	+#include <sys/types.h>
		90	+ /* Check that off_t can represent 2**63 - 1 correctly.
		91	+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
		92	+ since some C++ compilers masquerading as C compilers
		93	+ incorrectly reject 9223372036854775807. */
94	+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
95	+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
96	+ && LARGE_OFF_T % 2147483647 == 1)
97	+ ? 1 : -1];
98	+int
99	+main ()
100	+{
101	+
102	+ ;
103	+ return 0;
104	+}
105	+_ACEOF
106	+ if ac_fn_c_try_compile "$LINENO"; then :
107	+ break
108	+fi
109	+rm -f core conftest.err conftest.$ac_objext
110	+ CC="$CC -n32"
111	+ if ac_fn_c_try_compile "$LINENO"; then :
112	+ ac_cv_sys_largefile_CC=' -n32'; break
113	+fi
114	+rm -f core conftest.err conftest.$ac_objext
115	+ break
116	+ done
117	+ CC=$ac_save_CC
118	+ rm -f conftest.$ac_ext
119	+ fi
120	+fi
121	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
122	+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
123	+ if test "$ac_cv_sys_largefile_CC" != no; then
124	+ CC=$CC$ac_cv_sys_largefile_CC
125	+ fi
126	+
127	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
128	+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
129	+if ${ac_cv_sys_file_offset_bits+:} false; then :
130	+ $as_echo_n "(cached) " >&6
131	+else
132	+ while :; do
133	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
134	+/* end confdefs.h. */
135	+#include <sys/types.h>
136	+ /* Check that off_t can represent 2**63 - 1 correctly.
137	+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
138	+ since some C++ compilers masquerading as C compilers
139	+ incorrectly reject 9223372036854775807. */
140	+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
141	+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
142	+ && LARGE_OFF_T % 2147483647 == 1)
143	+ ? 1 : -1];
144	+int
145	+main ()
146	+{
147	+
148	+ ;
149	+ return 0;
150	+}
151	+_ACEOF
152	+if ac_fn_c_try_compile "$LINENO"; then :
153	+ ac_cv_sys_file_offset_bits=no; break
154	+fi
155	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
156	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
157	+/* end confdefs.h. */
158	+#define _FILE_OFFSET_BITS 64
159	+#include <sys/types.h>
160	+ /* Check that off_t can represent 2**63 - 1 correctly.
161	+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
162	+ since some C++ compilers masquerading as C compilers
163	+ incorrectly reject 9223372036854775807. */
164	+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
165	+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
166	+ && LARGE_OFF_T % 2147483647 == 1)
167	+ ? 1 : -1];
168	+int
169	+main ()
170	+{
171	+
172	+ ;
173	+ return 0;
174	+}
175	+_ACEOF
176	+if ac_fn_c_try_compile "$LINENO"; then :
177	+ ac_cv_sys_file_offset_bits=64; break
178	+fi
179	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
180	+ ac_cv_sys_file_offset_bits=unknown
181	+ break
182	+done
183	+fi
184	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
185	+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
186	+case $ac_cv_sys_file_offset_bits in #(
187	+ no \| unknown) ;;
188	+ *)
189	+cat >>confdefs.h <<_ACEOF
190	+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
191	+_ACEOF
192	+;;
193	+esac
194	+rm -rf conftest*
195	+ if test $ac_cv_sys_file_offset_bits = unknown; then
196	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
197	+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
198	+if ${ac_cv_sys_large_files+:} false; then :
199	+ $as_echo_n "(cached) " >&6
200	+else
201	+ while :; do
202	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
203	+/* end confdefs.h. */
204	+#include <sys/types.h>
205	+ /* Check that off_t can represent 2**63 - 1 correctly.
206	+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
207	+ since some C++ compilers masquerading as C compilers
208	+ incorrectly reject 9223372036854775807. */
209	+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
210	+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
211	+ && LARGE_OFF_T % 2147483647 == 1)
212	+ ? 1 : -1];
213	+int
214	+main ()
215	+{
216	+
217	+ ;
218	+ return 0;
219	+}
220	+_ACEOF
221	+if ac_fn_c_try_compile "$LINENO"; then :
222	+ ac_cv_sys_large_files=no; break
223	+fi
224	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
225	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
226	+/* end confdefs.h. */
227	+#define _LARGE_FILES 1
228	+#include <sys/types.h>
229	+ /* Check that off_t can represent 2**63 - 1 correctly.
230	+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
231	+ since some C++ compilers masquerading as C compilers
232	+ incorrectly reject 9223372036854775807. */
233	+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
234	+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
235	+ && LARGE_OFF_T % 2147483647 == 1)
236	+ ? 1 : -1];
237	+int
238	+main ()
239	+{
240	+
241	+ ;
242	+ return 0;
243	+}
244	+_ACEOF
245	+if ac_fn_c_try_compile "$LINENO"; then :
246	+ ac_cv_sys_large_files=1; break
247	+fi
248	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
249	+ ac_cv_sys_large_files=unknown
250	+ break
251	+done
252	+fi
253	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
254	+$as_echo "$ac_cv_sys_large_files" >&6; }
255	+case $ac_cv_sys_large_files in #(
256	+ no \| unknown) ;;
257	+ *)
258	+cat >>confdefs.h <<_ACEOF
259	+#define _LARGE_FILES $ac_cv_sys_large_files
260	+_ACEOF
261	+;;
262	+esac
263	+rm -rf conftest*
264	+ fi
265	+
266	+
267	+fi
268	+
269	+
270	ac_ext=c
271	ac_cpp='$CPP $CPPFLAGS'
272	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'