summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-09-23 17:15:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-24 17:24:13 +0100
commit729033237b0a2e08c9b886490f2f3cdf24bada9e (patch)
tree8b23f5c61e5d374a02bbfc917d76d59e4b7da1e9
parenta60c6b3bdcfe6ecb6066186ec371ae9ecbf92e3a (diff)
downloadpoky-729033237b0a2e08c9b886490f2f3cdf24bada9e.tar.gz
elfutils: remove configure bits from patch
That is a generated file and patching it might fail, the patch already patches configure.ac which will have the configure file regenerated. (From OE-Core rev: daa56093de3a518b79480c90ec5124a79189bf7b) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff228
1 files changed, 0 insertions, 228 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff
index bf47ade8db..d5628aa3f1 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff
@@ -277,234 +277,6 @@ Index: elfutils-0.155/config.h.in
277+#undef __thread 277+#undef __thread
278+ 278+
279 #include <eu-config.h> 279 #include <eu-config.h>
280Index: elfutils-0.155/configure
281===================================================================
282--- elfutils-0.155.orig/configure
283+++ elfutils-0.155/configure
284@@ -598,6 +598,8 @@ ZLIB_TRUE
285 LIBEBL_SUBDIR
286 TESTS_RPATH_FALSE
287 TESTS_RPATH_TRUE
288+BUILD_WERROR_FALSE
289+BUILD_WERROR_TRUE
290 BUILD_STATIC_FALSE
291 BUILD_STATIC_TRUE
292 GCOV_FALSE
293@@ -612,6 +614,8 @@ NEVER_TRUE
294 base_cpu
295 NATIVE_LD_FALSE
296 NATIVE_LD_TRUE
297+LD_AS_NEEDED
298+WEXTRA
299 LEXLIB
300 LEX_OUTPUT_ROOT
301 LEX
302@@ -725,6 +729,7 @@ enable_mudflap
303 enable_debugpred
304 enable_gprof
305 enable_gcov
306+enable_werror
307 enable_tests_rpath
308 enable_libebl_subdir
309 with_zlib
310@@ -1378,6 +1383,7 @@ Optional Features:
311 prediction
312 --enable-gprof build binaries with gprof support
313 --enable-gcov build binaries with gcov support
314+ --disable-werror do not build with -Werror
315 --enable-tests-rpath build $ORIGIN-using rpath into tests
316 --enable-libebl-subdir=DIR
317 install libebl_CPU modules in $(libdir)/DIR
318@@ -3917,6 +3923,130 @@ if test "x$ac_cv_c99" != xyes; then :
319 as_fn_error $? "gcc with C99 support required" "$LINENO" 5
320 fi
321
322+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5
323+$as_echo_n "checking for -Wextra option to $CC... " >&6; }
324+if ${ac_cv_cc_wextra+:} false; then :
325+ $as_echo_n "(cached) " >&6
326+else
327+ old_CFLAGS="$CFLAGS"
328+CFLAGS="$CFLAGS -Wextra"
329+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
330+/* end confdefs.h. */
331+void foo (void) { }
332+_ACEOF
333+if ac_fn_c_try_compile "$LINENO"; then :
334+ ac_cv_cc_wextra=yes
335+else
336+ ac_cv_cc_wextra=no
337+fi
338+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
339+CFLAGS="$old_CFLAGS"
340+fi
341+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5
342+$as_echo "$ac_cv_cc_wextra" >&6; }
343+
344+if test "x$ac_cv_cc_wextra" = xyes; then :
345+ WEXTRA=-Wextra
346+else
347+ WEXTRA=-W
348+fi
349+
350+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5
351+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
352+if ${ac_cv_cc_gnu89_inline+:} false; then :
353+ $as_echo_n "(cached) " >&6
354+else
355+ old_CFLAGS="$CFLAGS"
356+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
357+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
358+/* end confdefs.h. */
359+
360+void foo (void)
361+{
362+ inline void bar (void) {}
363+ bar ();
364+}
365+extern inline void baz (void) {}
366+
367+_ACEOF
368+if ac_fn_c_try_compile "$LINENO"; then :
369+ ac_cv_cc_gnu89_inline=yes
370+else
371+ ac_cv_cc_gnu89_inline=no
372+fi
373+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
374+CFLAGS="$old_CFLAGS"
375+fi
376+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5
377+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
378+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :
379+ WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
380+fi
381+
382+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5
383+$as_echo_n "checking for --as-needed linker option... " >&6; }
384+if ${ac_cv_as_needed+:} false; then :
385+ $as_echo_n "(cached) " >&6
386+else
387+ cat > conftest.c <<EOF
388+int main (void) { return 0; }
389+EOF
390+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
391+ -fPIC -shared -o conftest.so conftest.c
392+ -Wl,--as-needed 1>&5'
393+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
394+ (eval $ac_try) 2>&5
395+ ac_status=$?
396+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
397+ test $ac_status = 0; }; }
398+then
399+ ac_cv_as_needed=yes
400+else
401+ ac_cv_as_needed=no
402+fi
403+rm -f conftest*
404+fi
405+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5
406+$as_echo "$ac_cv_as_needed" >&6; }
407+if test "x$ac_cv_as_needed" = xyes; then :
408+ LD_AS_NEEDED=-Wl,--as-needed
409+else
410+ LD_AS_NEEDED=
411+fi
412+
413+
414+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
415+$as_echo_n "checking for __builtin_popcount... " >&6; }
416+if ${ac_cv_popcount+:} false; then :
417+ $as_echo_n "(cached) " >&6
418+else
419+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
420+/* end confdefs.h. */
421+
422+int
423+main ()
424+{
425+exit (__builtin_popcount (127));
426+ ;
427+ return 0;
428+}
429+_ACEOF
430+if ac_fn_c_try_link "$LINENO"; then :
431+ ac_cv_popcount=yes
432+else
433+ ac_cv_popcount=no
434+fi
435+rm -f core conftest.err conftest.$ac_objext \
436+ conftest$ac_exeext conftest.$ac_ext
437+fi
438+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5
439+$as_echo "$ac_cv_popcount" >&6; }
440+if test "x$ac_cv_popcount" = xyes; then :
441+
442+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h
443+
444+fi
445+
446 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
447 $as_echo_n "checking for __thread support... " >&6; }
448 if ${ac_cv_tls+:} false; then :
449@@ -3953,7 +4083,13 @@ fi
450 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
451 $as_echo "$ac_cv_tls" >&6; }
452 if test "x$ac_cv_tls" != xyes; then :
453- as_fn_error $? "__thread support required" "$LINENO" 5
454+ if test "$use_locks" = yes; then :
455+ as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5
456+else
457+
458+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h
459+
460+fi
461 fi
462
463 # Check whether --enable-largefile was given.
464@@ -4302,6 +4438,22 @@ else
465 fi
466
467
468+# Check whether --enable-werror was given.
469+if test "${enable_werror+set}" = set; then :
470+ enableval=$enable_werror; enable_werror=$enableval
471+else
472+ enable_werror=yes
473+fi
474+
475+ if test "$enable_werror" = yes; then
476+ BUILD_WERROR_TRUE=
477+ BUILD_WERROR_FALSE='#'
478+else
479+ BUILD_WERROR_TRUE='#'
480+ BUILD_WERROR_FALSE=
481+fi
482+
483+
484 # Check whether --enable-tests-rpath was given.
485 if test "${enable_tests_rpath+set}" = set; then :
486 enableval=$enable_tests_rpath; tests_use_rpath=$enableval
487@@ -5022,7 +5174,7 @@ case "$eu_version" in
488 esac
489
490 # Round up to the next release API (x.y) version.
491-eu_version=$(( (eu_version + 999) / 1000 ))
492+eu_version=`expr \( $eu_version + 999 \) / 1000`
493
494 cat >confcache <<\_ACEOF
495 # This file is a shell script that caches the results of configure
496@@ -5185,6 +5337,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
497 as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
498 Usually this means the macro was only invoked conditionally." "$LINENO" 5
499 fi
500+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then
501+ as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.
502+Usually this means the macro was only invoked conditionally." "$LINENO" 5
503+fi
504 if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
505 as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
506 Usually this means the macro was only invoked conditionally." "$LINENO" 5
507
508Index: elfutils-0.155/configure.ac 280Index: elfutils-0.155/configure.ac
509=================================================================== 281===================================================================
510--- elfutils-0.155.orig/configure.ac 282--- elfutils-0.155.orig/configure.ac