diff options
| author | Steve Capper <steve.capper@linaro.org> | 2015-10-29 15:19:19 +0000 |
|---|---|---|
| committer | Steve Capper <steve.capper@linaro.org> | 2015-10-30 09:32:44 +0000 |
| commit | 05cb67c8b3ac85ed3648bf1989101229ae7e6304 (patch) | |
| tree | 8c7800c58f6ca2594ed09b200c8b393a42b2a83c | |
| parent | c1fb903bcabb37a297a78ed934af6943586489ee (diff) | |
COMMONS-DAEMON: BIGTOP-JSVC: add AArch64 support
The commons-daemon component relies on hardcoded CPU strings in order to
build and has no knowledge of AArch64. This patch adds AArch64 support
and runs autoreconf to keep the commit size down.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
3 files changed, 19 insertions, 0 deletions
diff --git a/bigtop-packages/src/common/bigtop-jsvc/do-component-build b/bigtop-packages/src/common/bigtop-jsvc/do-component-build index d07efba8..464bebdb 100644 --- a/bigtop-packages/src/common/bigtop-jsvc/do-component-build +++ b/bigtop-packages/src/common/bigtop-jsvc/do-component-build @@ -19,6 +19,7 @@ set -ex rm -f jsvc pushd unix + autoreconf ./configure --prefix=/usr make cp -f jsvc ../jsvc diff --git a/bigtop-packages/src/common/bigtop-jsvc/patch0-add-aarch64.diff b/bigtop-packages/src/common/bigtop-jsvc/patch0-add-aarch64.diff new file mode 100644 index 00000000..2b4da16b --- /dev/null +++ b/bigtop-packages/src/common/bigtop-jsvc/patch0-add-aarch64.diff @@ -0,0 +1,15 @@ +diff -urN commons-daemon-1.0.15-native-src.orig/unix/support/apsupport.m4 commons-daemon-1.0.15-native-src/unix/support/apsupport.m4 +--- commons-daemon-1.0.15-native-src.orig/unix/support/apsupport.m4 2015-10-29 14:53:27.000000000 +0000 ++++ commons-daemon-1.0.15-native-src/unix/support/apsupport.m4 2015-10-29 15:00:46.730000000 +0000 +@@ -166,6 +166,11 @@ + supported_os="arm" + HOST_CPU=arm + ;; ++ aarch64*) ++ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" ++ supported_os="linux" ++ HOST_CPU=aarch64 ++ ;; + *) + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);; diff --git a/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec b/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec index 6203d2a8..49891ecf 100644 --- a/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec +++ b/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec @@ -33,6 +33,7 @@ License: ASL 2.0 Source0: commons-daemon-%{bigtop_jsvc_base_version}.tar.gz Source1: do-component-build Source2: install_jsvc.sh +#BIGTOP_PATCH_FILES BuildRequires: autoconf, automake, gcc Requires: bigtop-utils >= 0.7 @@ -42,6 +43,8 @@ jsvc executes classfile that implements a Daemon interface. %prep %setup -n commons-daemon-%{bigtop_jsvc_base_version}-native-src +#BIGTOP_PATCH_COMMANDS + %clean rm -rf $RPM_BUILD_ROOT |