From 453e1dfae7bd7e5fa8be4bf1ef3ec68fdcffcd6f Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Tue, 12 Apr 2016 08:47:42 +0100 Subject: use rtp's solution to build for armv5tl on armv5tl distro --- Makefile.am | 1 + NEWS | 2 ++ configure.ac | 3 +++ rpmrc.in | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 769bc28..f96323f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,6 +99,7 @@ edit = sed \ -e 's,@RPMOS\@,$(RPMOS),g' \ -e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \ -e 's,@CANONTARGETGNU\@,$(CANONTARGETGNU),g' \ + -e 's,@ARMV7CANONTARGETCPU\@,$(ARMV7CANONTARGETCPU),g' \ -e 's,@RPMALLARCH\@,$(RPMALLARCH),g' \ -e 's,@DISTSUFFIX\@,$(DISTSUFFIX),g' diff --git a/NEWS b/NEWS index 733cb75..4f5cfb0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- use rtp's solution to build for armv5tl on armv5tl distro + Version 2.18 - 12 April 2016, by Pascal Terjan - add config for armv7hl diff --git a/configure.ac b/configure.ac index 69c7da5..2502a6c 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ AC_CHECK_HEADERS([string.h]) CANONTARGETCPU=${target_cpu} CANONTARGETGNU=-gnu +ARMV7CANONTARGETCPU="armv5tl" case "${target_cpu}" in *86|athlon|k6|pentium*) @@ -96,12 +97,14 @@ case "${target_cpu}" in RPMALLARCH="armv7hl" CANONTARGETCPU=armv7hl CANONTARGETGNU=-gnueabi + ARMV7CANONTARGETCPU="armv7hl" esac RPMALLARCH="${RPMALLARCH} noarch" AC_SUBST(RPMALLARCH) AC_SUBST(CANONTARGETCPU) AC_SUBST(CANONTARGETCPU32) AC_SUBST(CANONTARGETGNU) +AC_SUBST(ARMV7CANONTARGETCPU) # # get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os diff --git a/rpmrc.in b/rpmrc.in index bc4bef5..80e34c6 100644 --- a/rpmrc.in +++ b/rpmrc.in @@ -105,7 +105,7 @@ buildarchtranslate: i386: i386 buildarchtranslate: armv5tel: armv5tl buildarchtranslate: armv5t: armv5t buildarchtranslate: armv7: armv5t -buildarchtranslate: armv7l: armv7hl +buildarchtranslate: armv7l: @ARMV7CANONTARGETCPU@ buildarchtranslate: armv7hl: armv7hl buildarchtranslate: armv7hnl: armv7hl -- cgit v1.2.1