Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Sun Oct 2 11:13:54 CEST 2011.
-------- --- openSUSE:Factory/rpm/rpm.changes 2011-09-29 12:53:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2011-09-30 14:11:50.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Sep 30 06:42:49 UTC 2011 - [email protected] + +- enforce armv7hl plattform by default, despite the kernel only + reports armv7l via uname. +- make armv7hl backward compatible to armv7l + +------------------------------------------------------------------- +Thu Sep 29 18:49:33 CEST 2011 - [email protected] + +- fix architecture definition for armv5el + +------------------------------------------------------------------- +Thu Sep 29 15:16:11 UTC 2011 - [email protected] + +- use -O0 for soft FPU ARM + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.ZgXqC4/_old 2011-10-02 11:13:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ZgXqC4/_new 2011-10-02 11:13:47.000000000 +0200 @@ -195,24 +195,29 @@ %build export CFLAGS="$RPM_OPT_FLAGS -ffunction-sections" export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections" -%ifarch alpha -export CFLAGS="-g -O0 -fno-strict-aliasing" +%ifarch alpha armv5tel +export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections" %endif + +%if %{_target_cpu} +%ifarch %arm +BUILDTARGET="--build=%{_target_cpu}-suse-linux-gnueabi" +%else +BUILDTARGET="--build=%{_target_cpu}-suse-linux" +%endif +%endif + #cp -p /usr/share/gettext/config.rpath . cp autogen.sh beecrypt pushd beecrypt -./autogen.sh --with-pic --without-python +./autogen.sh --with-pic --without-python $BUILDTARGET make %{?_smp_mflags} popd -%ifarch %arm armv5l armv7l armv7hl -HOST="%{_host_cpu}-suse-linux-gnueabi" # configure.ac detects this to set %_gnu in macros -%else -HOST="%{_host_cpu}-suse-linux" -%endif + ./autogen.sh --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \ ---with-selinux --with-internal-beecrypt --with-acl --with-cap --enable-shared %{?with_python: --enable-python} \ ---host="$HOST" --build="$HOST" --target="$HOST" +--with-selinux --with-internal-beecrypt \ +--with-acl --with-cap --enable-shared %{?with_python: --enable-python} $BUILDTARGET rm po/de.gmo make %{?_smp_mflags} @@ -290,6 +295,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/rpm-plugins/*.la sh $RPM_BUILD_ROOT/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT rpm +%ifarch armv7hl +# rpm is using the host_cpu as default for the platform, but armv7hl is not known by the kernel. +# so we need to enforce the platform here. +# We don't want to use armv7l because it would make us incompatible to Fedora and MeeGo plattforms. +echo -n armv7hl-suse-linux> $RPM_BUILD_ROOT/etc/rpm/platform +%endif %clean rm -rf $RPM_BUILD_ROOT ++++++ rpmrc.diff ++++++ --- /var/tmp/diff_new_pack.ZgXqC4/_old 2011-10-02 11:13:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ZgXqC4/_new 2011-10-02 11:13:51.000000000 +0200 @@ -1,9 +1,5 @@ -SUSE specific rpmrc changes. - -Index: rpmrc.in -=================================================================== ---- rpmrc.in.orig -+++ rpmrc.in +--- rpmrc.in.orig 2011-09-30 08:38:11.410453344 +0200 ++++ rpmrc.in 2011-09-30 14:10:00.149253193 +0200 @@ -12,16 +12,16 @@ # "fat" binary with both archs, for Darwin optflags: fat -O2 -g -arch i386 -arch ppc @@ -30,7 +26,7 @@ optflags: amd64 -O2 -g optflags: ia32e -O2 -g -@@ -41,15 +41,16 @@ optflags: sparc64v -O2 -g -m64 -mtune=ni +@@ -41,15 +41,16 @@ optflags: m68k -O2 -g -fomit-frame-pointer @@ -54,7 +50,15 @@ optflags: hppa1.0 -O2 -g -mpa-risc-1-0 optflags: hppa1.1 -O2 -g -mpa-risc-1-0 optflags: hppa1.2 -O2 -g -mpa-risc-1-0 -@@ -75,8 +76,8 @@ optflags: atariclone -O2 -g -fomit-frame +@@ -66,6 +67,7 @@ + optflags: armv5tejl -O2 -g -march=armv5te + optflags: armv6l -O2 -g -march=armv6 + optflags: armv7l -O2 -g -march=armv7 ++optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mthumb -mabi=aapcs-linux + + optflags: atarist -O2 -g -fomit-frame-pointer + optflags: atariste -O2 -g -fomit-frame-pointer +@@ -75,8 +77,8 @@ optflags: milan -O2 -g -fomit-frame-pointer optflags: hades -O2 -g -fomit-frame-pointer @@ -65,7 +69,15 @@ optflags: sh3 -O2 -g optflags: sh4 -O2 -g -mieee -@@ -200,17 +201,17 @@ os_canon: MacOSX: macosx 21 +@@ -140,6 +142,7 @@ + arch_canon: armv5tejl: armv5tejl 12 + arch_canon: armv6l: armv6l 12 + arch_canon: armv7l: armv7l 12 ++arch_canon: armv7hl: armv7hl 12 + + arch_canon: m68kmint: m68kmint 13 + arch_canon: atarist: m68kmint 13 +@@ -200,17 +203,17 @@ ############################################################# # For a given uname().machine, the default build arch @@ -91,7 +103,7 @@ buildarchtranslate: i486: i386 buildarchtranslate: i386: i386 -@@ -239,6 +240,7 @@ buildarchtranslate: ppciseries: ppc +@@ -239,6 +242,7 @@ buildarchtranslate: ppcpseries: ppc buildarchtranslate: ppc64iseries: ppc64 buildarchtranslate: ppc64pseries: ppc64 @@ -99,7 +111,15 @@ buildarchtranslate: armv3l: armv3l buildarchtranslate: armv4b: armv4b -@@ -270,6 +272,15 @@ buildarchtranslate: sh3: sh3 +@@ -248,6 +252,7 @@ + buildarchtranslate: armv5tejl: armv5tejl + buildarchtranslate: armv6l: armv6l + buildarchtranslate: armv7l: armv7l ++buildarchtranslate: armv7hl: armv7hl + + buildarchtranslate: atarist: m68kmint + buildarchtranslate: atariste: m68kmint +@@ -270,6 +275,15 @@ buildarchtranslate: sh4: sh4 buildarchtranslate: sh4a: sh4 @@ -115,7 +135,7 @@ ############################################################# # Architecture compatibility -@@ -325,14 +336,18 @@ arch_compat: mipsel: noarch +@@ -325,14 +339,19 @@ arch_compat: hppa2.0: hppa1.2 arch_compat: hppa1.2: hppa1.1 arch_compat: hppa1.1: hppa1.0 @@ -127,6 +147,7 @@ +arch_compat: armv5teb: armv5b +arch_compat: armv5b: armv4b arch_compat: armv4b: noarch ++arch_compat: armv7hl: armv7l arch_compat: armv7l: armv6l arch_compat: armv6l: armv5tejl arch_compat: armv5tejl: armv5tel @@ -136,7 +157,7 @@ arch_compat: armv4tl: armv4l arch_compat: armv4l: armv3l arch_compat: armv3l: noarch -@@ -349,9 +364,9 @@ arch_compat: i370: noarch +@@ -349,9 +368,9 @@ arch_compat: s390: noarch arch_compat: s390x: s390 noarch @@ -148,7 +169,15 @@ arch_compat: amd64: x86_64 athlon noarch arch_compat: ia32e: x86_64 athlon noarch -@@ -444,7 +459,8 @@ buildarch_compat: armv3l: noarch +@@ -433,6 +452,7 @@ + buildarch_compat: mipsel: noarch + + buildarch_compat: armv4b: noarch ++buildarch_compat: armv7hl: armv7l + buildarch_compat: armv7l: armv6l + buildarch_compat: armv6l: armv5tejl + buildarch_compat: armv5tejl: armv5tel +@@ -444,7 +464,8 @@ buildarch_compat: hppa2.0: hppa1.2 buildarch_compat: hppa1.2: hppa1.1 buildarch_compat: hppa1.1: hppa1.0 @@ -158,31 +187,3 @@ buildarch_compat: parisc: noarch buildarch_compat: atarist: m68kmint noarch ---- rpmrc.in.orig 2011-09-19 18:20:32.000000000 +0200 -+++ rpmrc.in 2011-09-28 07:08:02.993553860 +0200 -@@ -250,6 +250,7 @@ - buildarchtranslate: armv5tejl: armv5tejl - buildarchtranslate: armv6l: armv6l - buildarchtranslate: armv7l: armv7l -+buildarchtranslate: armv7hl: armv7hl - - buildarchtranslate: atarist: m68kmint - buildarchtranslate: atariste: m68kmint -@@ -340,6 +341,8 @@ - arch_compat: hppa: parisc - arch_compat: parisc: noarch - -+arch_compat: armv7hl: noarch -+ - arch_compat: armv5teb: armv5b - arch_compat: armv5b: armv4b - arch_compat: armv4b: noarch -@@ -447,6 +450,8 @@ - buildarch_compat: mips: noarch - buildarch_compat: mipsel: noarch - -+buildarch_compat: armv7hl: noarch -+ - buildarch_compat: armv4b: noarch - buildarch_compat: armv7l: armv6l - buildarch_compat: armv6l: armv5tejl continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
