diff --git a/glibc-compiled-binaries.diff b/glibc-compiled-binaries.diff deleted file mode 100644 index 54ed1f2..0000000 --- a/glibc-compiled-binaries.diff +++ /dev/null @@ -1,96 +0,0 @@ ---- - config.make.in | 1 + - configure | 16 +++++++++++++++- - configure.in | 1 + - posix/Makefile | 2 +- - 6 files changed, 20 insertions(+), 4 deletions(-) - -Index: glibc-2.15.90/config.make.in -=================================================================== ---- glibc-2.15.90.orig/config.make.in -+++ glibc-2.15.90/config.make.in -@@ -97,6 +97,7 @@ add-ons = @add_ons@ - add-on-subdirs = @add_on_subdirs@ - sysdeps-add-ons = @sysdeps_add_ons@ - cross-compiling = @cross_compiling@ -+compiled-binaries-can-run-on-buildhost = @compiled_binaries_can_run_on_buildhost@ - force-install = @force_install@ - link-obsolete-rpc = @link_obsolete_rpc@ - -Index: glibc-2.15.90/configure.in -=================================================================== ---- glibc-2.15.90.orig/configure.in -+++ glibc-2.15.90/configure.in -@@ -20,6 +20,7 @@ if test $host != $build; then - AC_CHECK_PROGS(BUILD_CC, gcc cc) - fi - AC_SUBST(cross_compiling) -+AC_SUBST(compiled_binaries_can_run_on_buildhost) - AC_PROG_CPP - # We need the C++ compiler only for testing. - AC_PROG_CXX -Index: glibc-2.15.90/configure -=================================================================== ---- glibc-2.15.90.orig/configure -+++ glibc-2.15.90/configure -@@ -553,6 +553,7 @@ ac_clean_files= - ac_config_libobj_dir=. - LIBOBJS= - cross_compiling=no -+compiled_binaries_can_run_on_buildhost=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -667,6 +668,7 @@ CXXFLAGS - CXX - CPP - cross_compiling -+compiled_binaries_can_run_on_buildhost - BUILD_CC - OBJEXT - ac_ct_CC -@@ -1208,6 +1210,13 @@ do - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - -+# Check whether --enable-runbinaries was given. -+if test "${enable_runbinaries+set}" = set; then -+ enableval=$enable_runbinaries; compiled_binaries_can_run_on_buildhost=$enableval -+else -+ compiled_binaries_can_run_on_buildhost=yes -+fi -+ - # There might be people who depend on the old broken behavior: `$host' - # used to hold the argument of --host etc. - # FIXME: To remove some day. -@@ -1223,6 +1232,7 @@ if test "x$host_alias" != x; then - If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -+ compiled_binaries_can_run_on_buildhost=no - fi - fi - -@@ -1407,6 +1417,9 @@ Optional Features: - --enable-obsolete-rpc build and install the obsolete RPC code for - link-time usage - --enable-systemtap enable systemtap static probe points [default=no] -+ --enable-runbinaries the compiled binaries should run on the buildhost because -+ it happens to have a compatible cpu -+ - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -Index: glibc-2.15.90/posix/Makefile -=================================================================== ---- glibc-2.15.90.orig/posix/Makefile -+++ glibc-2.15.90/posix/Makefile -@@ -305,7 +305,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi - done < $(objpfx)getconf.speclist - - $(objpfx)getconf.speclist: $(objpfx)getconf --ifeq (no,$(cross-compiling)) -+ifeq (yes,$(compiled-binaries-can-run-on-buildhost)) - LC_ALL=C GETCONF_DIR=/dev/null \ - $(run-program-prefix) $< _POSIX_V7_WIDTH_RESTRICTED_ENVS > $@.new - LC_ALL=C GETCONF_DIR=/dev/null \