Hello community, here is the log from the commit of package glibc checked in at Fri Nov 21 15:08:08 CET 2008. -------- --- glibc/glibc.changes 2008-11-17 14:35:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2008-11-21 14:04:47.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Nov 21 14:04:16 CET 2008 - olh@suse.de + +- fix check-build.sh to actually allow building on ppc* again + +------------------------------------------------------------------- +Fri Nov 21 13:36:05 CET 2008 - olh@suse.de + +- do not run compiled binaries with cputuned libraries [bnc#445911] + the buildhost only generates them, but must not execute them + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- glibc.compiled-binaries-can-run-on-buildhost.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.vh6388/_old 2008-11-21 15:06:53.000000000 +0100 +++ /var/tmp/diff_new_pack.vh6388/_new 2008-11-21 15:06:53.000000000 +0100 @@ -69,7 +69,7 @@ Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.9 -Release: 1 +Release: 2 %define snapshot_date 2008111711 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem @@ -127,6 +127,7 @@ Patch38: glibc-2.8-clone.diff Patch39: glibc-nss-deepbind.diff Patch40: glibc-fix-nscd.diff +Patch42: glibc.compiled-binaries-can-run-on-buildhost.patch Patch60: glibc-selinux.patch Patch62: glibc-getgroups-fortify.diff Patch63: missing-include-build-fix.diff @@ -325,6 +326,7 @@ %patch38 %patch39 %patch40 +%patch42 -p1 %patch5 %patch60 %patch62 @@ -465,13 +467,13 @@ ; do mkdir cc-$pcpu cd cc-$pcpu -configure_and_build_glibc "$BuildFlags -mcpu=$pcpu" "$add_ons,powerpc-cpu" --with-cpu=$pcpu +configure_and_build_glibc "$BuildFlags -mcpu=$pcpu" "$add_ons,powerpc-cpu" --with-cpu=$pcpu --disable-runbinaries cd .. done %if %{powerpc_optimize_cpu_cell} mkdir cc-ppc-cell-be cd cc-ppc-cell-be -configure_and_build_glibc "$BuildFlags -mcpu=cell" "$add_ons" +configure_and_build_glibc "$BuildFlags -mcpu=cell" "$add_ons" --disable-runbinaries cd .. %endif # optimize_power @@ -1095,6 +1097,11 @@ %{_libdir}/libdl_p.a %changelog +* Fri Nov 21 2008 olh@suse.de +- fix check-build.sh to actually allow building on ppc* again +* Fri Nov 21 2008 olh@suse.de +- do not run compiled binaries with cputuned libraries [bnc#445911] + the buildhost only generates them, but must not execute them * Mon Nov 17 2008 pbaudis@suse.cz - Update to glibc-2.9 final * Thu Nov 06 2008 jjolly@suse.de ++++++ check-build.sh ++++++ --- /var/tmp/diff_new_pack.vh6388/_old 2008-11-21 15:06:53.000000000 +0100 +++ /var/tmp/diff_new_pack.vh6388/_new 2008-11-21 15:06:53.000000000 +0100 @@ -13,114 +13,11 @@ exit 1 fi -case $BUILD_BASENAME in - *x86_64*) - if [ `ulimit -v` -le 740000 ] ; then - echo "build does not work on `hostname`: not enough memory" - exit 1 - fi - # Some AMD64 hosts are only broken: - case `/bin/hostname` in - stravinsky|Stravinsky) - echo "This host is known to have a broken time" - exit 1 - ;; - *) - ;; - esac - ;; - *) - ;; -esac - -case $BUILD_BASENAME in - *i386|*i686|*x86_64) - grep "Linux version 2.[0-5].[0-9][0-9]" /proc/version > /dev/null - if [ $? -ne 1 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.11 for this package" - exit 1 - fi - grep "Linux version 2.6.[0-9]-" /proc/version > /dev/null - if [ $? -eq 0 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.11 for this package" - exit 1 - fi - grep "Linux version 2.6.10-" /proc/version > /dev/null - if [ $? -eq 0 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.11 for this package" - exit 1 - fi - ;; - *ppc) - grep -qEm1 'POWER[45]|PPC970|Cell' /proc/cpuinfo - if [ $? -ne 0 ] ; then - echo "FATAL: can not run POWER4/5 optimized binaries" - exit 1 - fi - grep -q -m1 'altivec supported' /proc/cpuinfo - if [ $? -ne 0 ] ; then - echo "FATAL: can not run POWER6 optimized binaries" - exit 1 - fi - grep "Linux version 2.[0-5].[0-9][0-9]" /proc/version > /dev/null - if [ $? -ne 1 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.7 for this package" - exit 1 - fi - grep "Linux version 2.6.[0-6]-" /proc/version > /dev/null - if [ $? -eq 0 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.7 for this package" - exit 1 - fi - grep "Linux version 2.6.8-[0-6]-" /proc/version > /dev/null - if [ $? -eq 0 ]; then - echo "FATAL: kernel too buggy, please update!" - exit 1 - fi - - ;; - *ppc64) - grep -qEm1 'POWER[45]|PPC970|Cell' /proc/cpuinfo - if [ $? -ne 0 ] ; then - echo "FATAL: can not run POWER4/5 optimized binaries" - exit 1 - fi - grep -q -m1 'altivec supported' /proc/cpuinfo - if [ $? -ne 0 ] ; then - echo "FATAL: can not run POWER6 optimized binaries" - exit 1 - fi - grep "Linux version 2.[0-5].[0-9][0-9]" /proc/version > /dev/null - if [ $? -ne 1 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.5 for this package" - exit 1 - fi - grep "Linux version 2.6.[0-4]-" /proc/version > /dev/null - if [ $? -eq 0 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.5 for this package" - exit 1 - fi - ;; - *ia64|*s390|*s390x|*axp) - grep "Linux version 2.[0-5].[0-9][0-9]" /proc/version > /dev/null - if [ $? -ne 1 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.5 for this package" - exit 1 - fi - grep "Linux version 2.6.[0-4]-" /proc/version > /dev/null - if [ $? -eq 0 ]; then - echo "FATAL: kernel too old, need kernel >= 2.6.5 for this package" - exit 1 - fi - ;; - *) - ;; -esac - -# xen kernel have broken tls and nanosleep -if [ -e /proc/xen ]; then - echo "FATAL: kernel contains xen support!" - exit 1 +# get kernel version +OFS="$IFS" ; IFS=".-" ; version=(`uname -r`) ; IFS="$OIFS" +if test ${version[0]} -lt 2 -o ${version[1]} -lt 6 -o ${version[2]} -lt 11 ; then + echo "FATAL: kernel too old, need kernel >= 2.6.11 for this package" 1>&2 + exit 1 fi ++++++ glibc.compiled-binaries-can-run-on-buildhost.patch ++++++ --- config.make.in | 1 + configure | 16 +++++++++++++++- configure.in | 1 + posix/Makefile | 2 +- sunrpc/Makefile | 2 +- timezone/Makefile | 2 +- 6 files changed, 20 insertions(+), 4 deletions(-) --- a/config.make.in +++ b/config.make.in @@ -90,6 +90,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@ # Build tools. --- a/configure +++ b/configure @@ -567,6 +567,7 @@ ac_clean_files= ac_config_libobj_dir=. LIBOBJS= cross_compiling=no +compiled_binaries_can_run_on_buildhost=yes subdirs= MFLAGS= MAKEFLAGS= @@ -687,6 +688,7 @@ ac_ct_CC OBJEXT BUILD_CC cross_compiling +compiled_binaries_can_run_on_buildhost CPP CXX CXXFLAGS @@ -1180,6 +1182,13 @@ do { (exit 1); exit 1; }; } 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. @@ -1195,6 +1204,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 @@ -1381,6 +1391,9 @@ Optional Features: VERSION --enable-all-warnings enable all useful warnings gcc can issue + --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] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) @@ -9212,6 +9225,7 @@ ac_ct_CC!$ac_ct_CC$ac_delim OBJEXT!$OBJEXT$ac_delim BUILD_CC!$BUILD_CC$ac_delim cross_compiling!$cross_compiling$ac_delim +compiled_binaries_can_run_on_buildhost!$compiled_binaries_can_run_on_buildhost$ac_delim CPP!$CPP$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim @@ -9240,7 +9254,7 @@ PERL!$PERL$ac_delim INSTALL_INFO!$INSTALL_INFO$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- a/configure.in +++ b/configure.in @@ -835,6 +835,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 --- a/posix/Makefile +++ b/posix/Makefile @@ -301,7 +301,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_V6_WIDTH_RESTRICTED_ENVS > $@.new else --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -98,7 +98,7 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libresolv.a endif -ifeq (no,$(cross-compiling)) +ifeq (yes,$(compiled-binaries-can-run-on-buildhost)) # We can only build this library if we can run the rpcgen we build. headers += $(rpcsvc:%.x=rpcsvc/%.h) extra-libs := librpcsvc --- a/timezone/Makefile +++ b/timezone/Makefile @@ -69,7 +69,7 @@ installed-posixrules-file := $(firstword $(addprefix $(inst_zonedir)/, \ $(posixrules-file))) -ifeq ($(cross-compiling),no) +ifeq (yes,$(compiled-binaries-can-run-on-buildhost)) # Don't try to install the zoneinfo files since we can't run zic. install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ $(zonenames:%=posix/%) \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org