Accepting request 85365 from Base:System
add arm7hl architecture (forwarded request 85353 from adrianSuSE) OBS-URL: https://build.opensuse.org/request/show/85365 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=160
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
c06c9d2fdf
13
build.diff
13
build.diff
@ -45,7 +45,16 @@ on SUSE systems.
|
||||
cat Makefile.orig | sed -e '/^install[:-]/c\
|
||||
--- ./installplatform.orig 2010-12-03 12:11:57.000000000 +0000
|
||||
+++ ./installplatform 2011-05-11 15:18:44.000000000 +0000
|
||||
@@ -47,9 +47,9 @@ for SUBST in $SUBSTS ; do
|
||||
@@ -19,7 +19,7 @@
|
||||
case "$arch" in
|
||||
i[3456]86|pentium[34]|athlon|geode) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_pentium4_ s_i386_athlon_ s_i386_geode_' ;;
|
||||
alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
|
||||
- arm*) SUBSTS='s_arm_arm_ s_arm_armv3l_ s_arm_armv4l_ s_arm_armv4tl_ s_arm_armv5tel_ s_arm_armv5tejl_ s_arm_armv6l_ s_arm_armv7l_' ;;
|
||||
+ arm*) SUBSTS='s_arm_arm_ s_arm_armv3l_ s_arm_armv4l_ s_arm_armv4tl_ s_arm_armv5tel_ s_arm_armv5tejl_ s_arm_armv6l_ s_arm_armv7l_ s_arm_armv7hl_' ;;
|
||||
sh4*) SUBSTS='s_sh4_sh4_ s_sh4_sh4a_' ;;
|
||||
sparc*) SUBSTS='s_sparc\(64\|64v\|v9v\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
|
||||
powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
|
||||
@@ -47,9 +47,9 @@
|
||||
ARCH_INSTALL_POST='%{nil}'
|
||||
case "${ARCH}-${OS}" in
|
||||
sparc64*-linux) LIB=lib64 ;;
|
||||
@ -58,7 +67,7 @@ on SUSE systems.
|
||||
*) LIB=lib;;
|
||||
esac
|
||||
|
||||
@@ -129,6 +129,9 @@ for SUBST in $SUBSTS ; do
|
||||
@@ -129,6 +130,9 @@
|
||||
apple)
|
||||
VENDORSED='-e s,^@apple@,,'
|
||||
;;
|
||||
|
||||
@ -293,8 +293,8 @@
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for all supported ARM processors
|
||||
-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
|
||||
+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv7l
|
||||
+%arml armv3l armv4l armv5l armv5tel armv6l armv7l
|
||||
+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv7l armv7hl
|
||||
+%arml armv3l armv4l armv5l armv5tel armv6l armv7l armv7hl
|
||||
+%armb armv4b armv5b armv5teb
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 22 15:23:10 UTC 2011 - adrian@suse.de
|
||||
Tue Sep 27 13:34:41 UTC 2011 - adrian@suse.de
|
||||
|
||||
- use gnueabi for arm builds
|
||||
- define rpmv7hl architecture for hard fpu support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 6 11:16:29 UTC 2011 - vuntz@opensuse.org
|
||||
|
||||
11
rpm.spec
11
rpm.spec
@ -204,14 +204,15 @@ pushd beecrypt
|
||||
./autogen.sh --with-pic --without-python
|
||||
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} \
|
||||
%ifarch %arm armv5l armv7l
|
||||
--host="%{_host_cpu}-suse-linux-gnueabi" # configure.ac detects this to set %_gnu in macros
|
||||
%else
|
||||
--host="%{_host_cpu}-suse-linux"
|
||||
%endif
|
||||
--host="$HOST" --build="$HOST" --target="$HOST"
|
||||
|
||||
rm po/de.gmo
|
||||
make %{?_smp_mflags}
|
||||
|
||||
28
rpmrc.diff
28
rpmrc.diff
@ -158,3 +158,31 @@ Index: rpmrc.in
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user