Attachment #642954 for bug #723028




diff --git a/configure b/configure
index f7dce13..2b6ca08 100755
--- a/configure
+++ b/configure
@@ -3859,26 +3859,25 @@ $as_echo "#define HAVE_PS_STRINGS /**/" >>confdefs.h
 
 fi
 
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_AR+:} false; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $AR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AR="$AR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3886,10 +3885,9 @@ done
   done
 IFS=$as_save_IFS
 
-  ;;
-esac
 fi
-AR=$ac_cv_path_AR
+fi
+AR=$ac_cv_prog_AR
 if test -n "$AR"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
@@ -3899,26 +3897,27 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RANLIB+:} false; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $RANLIB in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3926,10 +3925,61 @@ done
   done
 IFS=$as_save_IFS
 
-  ;;
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
 esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
 fi
-RANLIB=$ac_cv_path_RANLIB
+RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
@@ -3939,6 +3989,60 @@ $as_echo "no" >&6; }
 fi
 
 
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
 
 LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio"
 
diff --git a/configure.ac b/configure.ac
index dfebb14..b3bd072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,8 @@ if test "$pgac_cv_var_PS_STRINGS" = yes ; then
   AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS struct exists on your platform (likely no).])
 fi
 
-AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(RANLIB, ranlib)
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib)
 
 LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio"
 AC_SUBST(LIBMOWGLI_MODULES)

Lines 20-26 RDEPEND="ssl? ( Link Here

(-)a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild (-2 / +5 lines)
20	DEPEND="${RDEPEND}"	20	DEPEND="${RDEPEND}"
21		21
22	DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )	22	DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
23	PATCHES=( "${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch )	23	PATCHES=(
		24	"${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
		25	"${FILESDIR}"/${P}-use-host-tools-for-ar-and-ranlib.patch
		26	)
		27
24	S="${WORKDIR}/${PN}-2-${PV}"	28	S="${WORKDIR}/${PN}-2-${PV}"
25		29
26	src_configure() {	30	src_configure() {
27	-

Return to bug 723028

Line 0 Link Here

(-)a/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch (+231 lines)
		1	diff --git a/configure b/configure
		2	index f7dce13..2b6ca08 100755
		3	--- a/configure
		4	+++ b/configure
		5	@@ -3859,26 +3859,25 @@ $as_echo "#define HAVE_PS_STRINGS /**/" >>confdefs.h
		6
		7	fi
		8
		9	-# Extract the first word of "ar", so it can be a program name with args.
		10	-set dummy ar; ac_word=$2
		11	+if test -n "$ac_tool_prefix"; then
		12	+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
		13	+set dummy ${ac_tool_prefix}ar; ac_word=$2
		14	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
		15	$as_echo_n "checking for $ac_word... " >&6; }
		16	-if ${ac_cv_path_AR+:} false; then :
		17	+if ${ac_cv_prog_AR+:} false; then :
		18	$as_echo_n "(cached) " >&6
		19	else
		20	- case $AR in
		21	- [\\/]* \| ?:[\\/]*)
		22	- ac_cv_path_AR="$AR" # Let the user override the test with a path.
		23	- ;;
		24	- *)
		25	- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		26	+ if test -n "$AR"; then
		27	+ ac_cv_prog_AR="$AR" # Let the user override the test.
		28	+else
		29	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		30	for as_dir in $PATH
		31	do
		32	IFS=$as_save_IFS
		33	test -z "$as_dir" && as_dir=.
		34	for ac_exec_ext in '' $ac_executable_extensions; do
		35	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
		36	- ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
		37	+ ac_cv_prog_AR="${ac_tool_prefix}ar"
		38	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
		39	break 2
		40	fi
		41	@@ -3886,10 +3885,9 @@ done
		42	done
		43	IFS=$as_save_IFS
		44
		45	- ;;
		46	-esac
		47	fi
		48	-AR=$ac_cv_path_AR
		49	+fi
		50	+AR=$ac_cv_prog_AR
		51	if test -n "$AR"; then
		52	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
		53	$as_echo "$AR" >&6; }
		54	@@ -3899,26 +3897,27 @@ $as_echo "no" >&6; }
		55	fi
		56
		57
		58	-# Extract the first word of "ranlib", so it can be a program name with args.
		59	-set dummy ranlib; ac_word=$2
		60	+fi
		61	+if test -z "$ac_cv_prog_AR"; then
		62	+ ac_ct_AR=$AR
		63	+ # Extract the first word of "ar", so it can be a program name with args.
		64	+set dummy ar; ac_word=$2
65	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
66	$as_echo_n "checking for $ac_word... " >&6; }
67	-if ${ac_cv_path_RANLIB+:} false; then :
68	+if ${ac_cv_prog_ac_ct_AR+:} false; then :
69	$as_echo_n "(cached) " >&6
70	else
71	- case $RANLIB in
72	- [\\/]* \| ?:[\\/]*)
73	- ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
74	- ;;
75	- *)
76	- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
77	+ if test -n "$ac_ct_AR"; then
78	+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
79	+else
80	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
81	for as_dir in $PATH
82	do
83	IFS=$as_save_IFS
84	test -z "$as_dir" && as_dir=.
85	for ac_exec_ext in '' $ac_executable_extensions; do
86	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
87	- ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
88	+ ac_cv_prog_ac_ct_AR="ar"
89	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
90	break 2
91	fi
92	@@ -3926,10 +3925,61 @@ done
93	done
94	IFS=$as_save_IFS
95
96	- ;;
97	+fi
98	+fi
99	+ac_ct_AR=$ac_cv_prog_ac_ct_AR
100	+if test -n "$ac_ct_AR"; then
101	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
102	+$as_echo "$ac_ct_AR" >&6; }
103	+else
104	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
105	+$as_echo "no" >&6; }
106	+fi
107	+
108	+ if test "x$ac_ct_AR" = x; then
109	+ AR=""
110	+ else
111	+ case $cross_compiling:$ac_tool_warned in
112	+yes:)
113	+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
114	+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
115	+ac_tool_warned=yes ;;
116	esac
117	+ AR=$ac_ct_AR
118	+ fi
119	+else
120	+ AR="$ac_cv_prog_AR"
121	+fi
122	+
123	+if test -n "$ac_tool_prefix"; then
124	+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
125	+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
126	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
127	+$as_echo_n "checking for $ac_word... " >&6; }
128	+if ${ac_cv_prog_RANLIB+:} false; then :
129	+ $as_echo_n "(cached) " >&6
130	+else
131	+ if test -n "$RANLIB"; then
132	+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
133	+else
134	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
135	+for as_dir in $PATH
136	+do
137	+ IFS=$as_save_IFS
138	+ test -z "$as_dir" && as_dir=.
139	+ for ac_exec_ext in '' $ac_executable_extensions; do
140	+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
141	+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
142	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
143	+ break 2
144	+ fi
145	+done
146	+ done
147	+IFS=$as_save_IFS
148	+
149	+fi
150	fi
151	-RANLIB=$ac_cv_path_RANLIB
152	+RANLIB=$ac_cv_prog_RANLIB
153	if test -n "$RANLIB"; then
154	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
155	$as_echo "$RANLIB" >&6; }
156	@@ -3939,6 +3989,60 @@ $as_echo "no" >&6; }
157	fi
158
159
160	+fi
161	+if test -z "$ac_cv_prog_RANLIB"; then
162	+ ac_ct_RANLIB=$RANLIB
163	+ # Extract the first word of "ranlib", so it can be a program name with args.
164	+set dummy ranlib; ac_word=$2
165	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
166	+$as_echo_n "checking for $ac_word... " >&6; }
167	+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
168	+ $as_echo_n "(cached) " >&6
169	+else
170	+ if test -n "$ac_ct_RANLIB"; then
171	+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
172	+else
173	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
174	+for as_dir in $PATH
175	+do
176	+ IFS=$as_save_IFS
177	+ test -z "$as_dir" && as_dir=.
178	+ for ac_exec_ext in '' $ac_executable_extensions; do
179	+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
180	+ ac_cv_prog_ac_ct_RANLIB="ranlib"
181	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
182	+ break 2
183	+ fi
184	+done
185	+ done
186	+IFS=$as_save_IFS
187	+
188	+fi
189	+fi
190	+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
191	+if test -n "$ac_ct_RANLIB"; then
192	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
193	+$as_echo "$ac_ct_RANLIB" >&6; }
194	+else
195	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
196	+$as_echo "no" >&6; }
197	+fi
198	+
199	+ if test "x$ac_ct_RANLIB" = x; then
200	+ RANLIB=""
201	+ else
202	+ case $cross_compiling:$ac_tool_warned in
203	+yes:)
204	+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
205	+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
206	+ac_tool_warned=yes ;;
207	+esac
208	+ RANLIB=$ac_ct_RANLIB
209	+ fi
210	+else
211	+ RANLIB="$ac_cv_prog_RANLIB"
212	+fi
213	+
214
215	LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio"
216
217	diff --git a/configure.ac b/configure.ac
218	index dfebb14..b3bd072 100644
219	--- a/configure.ac
220	+++ b/configure.ac
221	@@ -36,8 +36,8 @@ if test "$pgac_cv_var_PS_STRINGS" = yes ; then
222	AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS struct exists on your platform (likely no).])
223	fi
224
225	-AC_PATH_PROG(AR, ar)
226	-AC_PATH_PROG(RANLIB, ranlib)
227	+AC_CHECK_TOOL(AR, ar)
228	+AC_CHECK_TOOL(RANLIB, ranlib)
229
230	LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio"
231	AC_SUBST(LIBMOWGLI_MODULES)