(build): config build for arm

Utilities/MBTester/mbslave.cc

@@ -110,6 +110,8 @@ int main( int argc, char** argv )
 
 		if( f485 )
 		{
+#ifndef DISABLE_COMPORT_485F
+
 			ComPort485F* cp;
 
 			if( dev == "/dev/ttyS2" )
@@ -126,6 +128,10 @@ int main( int argc, char** argv )
 			mbs.setLog(dlog);
 			mbs.setVerbose(verb);
 			mbs.execute();
+#else
+			cerr << "DISABLE_COMPORT_485F" << endl;
+			return 1;
+#endif // #ifndef DISABLE_COMPORT_485F
 		}
 		else
 		{

conf/libuniset2.spec

@@ -12,6 +12,7 @@
 %def_disable netdata
 %def_enable api
 %def_enable logdb
+%def_enable com485f
 
 %define oname uniset2
 
@@ -326,7 +327,7 @@ SharedMemoryPlus extension ('all in one') for libuniset
 
 %build
 %autoreconf
-%configure %{subst_enable docs} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable pgsql} %{subst_enable python} %{subst_enable rrd} %{subst_enable io} %{subst_enable logicproc} %{subst_enable tests} %{subst_enable mqtt} %{subst_enable api} %{subst_enable netdata} %{subst_enable logdb}
+%configure %{subst_enable docs} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable pgsql} %{subst_enable python} %{subst_enable rrd} %{subst_enable io} %{subst_enable logicproc} %{subst_enable tests} %{subst_enable mqtt} %{subst_enable api} %{subst_enable netdata} %{subst_enable logdb} %{subst_enable com485f}
 %make_build
 
 # fix for ALTLinux build (noarch)

conf/release_helper.sh

@@ -7,6 +7,7 @@ load_mod spec
 
 REL=eter
 MAILDOMAIN=server
+OPTS=$*
 
 [ -z "$TOPDIR" ] && TOPDIR=/var/ftp/pub/Ourside
 
@@ -16,10 +17,10 @@ SPECNAME=libuniset2.spec
 if [ -z "$PLATFORM" ]; then
 	PLATFORM=i586
 	[[ `uname -m` == "x86_64" ]] && PLATFORM=x86_64
+	[[ `uname -m` == "aarch64" ]] && PLATFORM=aarch64
 fi
 
-PROJECT=$1
-test -n "$PROJECT" || PROJECT=$PKGNAME
+PROJECT=$PKGNAME
 
 [ -z "$GEN" ] && GEN=/var/ftp/pub/Ourside/$PLATFORM/genb.sh
 [ -a "$GEN" ] || GEN="genbasedir --create --progress --topdir=$TOPDIR $PLATFORM $PROJECT"
@@ -89,7 +90,7 @@ else
    add_changelog_helper "- new build" $SPECNAME
 fi
 
-rpmbb ${UNISET_BUILD_ADDON_OPTIONS} $SPECNAME || fatal "Can't build"
+rpmbb ${UNISET_BUILD_ADDON_OPTIONS} ${OPTS} $SPECNAME || fatal "Can't build"
 
 cp2ftp
              

conf/release_helper_arm.sh

+#!/bin/sh
+
+./release_helper.sh --disable=com485f --disable=mqtt --disable=docs

configure.ac

@@ -199,6 +199,31 @@ fi
 AM_CONDITIONAL(DISABLE_IO, test ${buildio} = false)
 AM_CONDITIONAL(ENABLE_IO, test ${buildio} = true)
 
+#check sys/io.h support
+AC_MSG_CHECKING([sys/io.h support])
+buildcom485f=true
+#AC_CHECK_HEADERS
+AC_ARG_ENABLE(com485f, AC_HELP_STRING([--disable-com485f], [disable sys/io.h support]),
+[ if test $enableval = yes; then buildcom485f=true; else buildcom485f=false; fi],[ buildcom485f=true; ])
+
+COMPORT_485F_CFLAGS=
+COMPORT_485F_CLIBS=
+DISABLE_COMPORT_485F=
+
+if test ${buildcom485f} = true; then
+    AC_MSG_RESULT([enabled])
+else
+    AC_MSG_RESULT([disabled])
+	COMPORT_485F_CFLAGS="-DDISABLE_COMPORT_485F"
+    DISABLE_COMPORT_485F=1
+fi
+
+AM_CONDITIONAL(DISABLE_COMPORT_485F, test ${buildcom485f} = false)
+AC_SUBST(DISABLE_COMPORT_485F)
+AC_SUBST(COMPORT_485F_CFLAGS)
+#AC_SUBST(COMPORT_485F_CLIBS)
+
+
 #check logicproc build
 AC_MSG_CHECKING([build logic processor extension])
 buildlproc=true
@@ -415,7 +440,7 @@ CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Woverloaded-virtual -Woverflow -D_GLIBCXX_U
 # export
 LDFLAGS="$LDFLAGS ${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS} ${POCO_LIBS} ${EV_LIBS}"
 # all developer liked options add to autogen.sh, please
-CXXFLAGS="-I\$(top_builddir)/include $CXXFLAGS -funsigned-char -std=c++11 -g -DCATCH_VERSION_MAJOR=${CATCH_VERSION_MAJOR} -D_GNU_SOURCE ${REST_API_CFLAGS} ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} ${POCO_CFLAGS} ${EV_CFLAGS} $CXX_EXTRA_FLAGS"
+CXXFLAGS="-I\$(top_builddir)/include $CXXFLAGS -funsigned-char -std=c++11 -g -DCATCH_VERSION_MAJOR=${CATCH_VERSION_MAJOR} -D_GNU_SOURCE ${REST_API_CFLAGS} ${COMPORT_485F_CFLAGS} ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} ${POCO_CFLAGS} ${EV_CFLAGS} $CXX_EXTRA_FLAGS"
 
 AC_SUBST(LDFLAGS)
 AC_SUBST(CXXFLAGS)

include/ComPort485F.h

+#ifndef DISABLE_COMPORT_485F
 /*
  * Copyright (c) 2015 Pavel Vainerman.
  *
@@ -71,3 +72,4 @@ namespace uniset
 // --------------------------------------------------------------------------
 #endif // COMPORT_485F_H_
 // --------------------------------------------------------------------------
+#endif // #ifndef DISABLE_COMPORT_485F

src/Communications/ComPort485F.cc

+#ifndef DISABLE_COMPORT_485F
 /*
  * Copyright (c) 2015 Pavel Vainerman.
  *
@@ -334,3 +335,4 @@ void ComPort485F::reopen()
 	ComPort::reopen();
 }
 // --------------------------------------------------------------------------------
+#endif // #ifndef DISABLE_COMPORT_485F

src/Communications/Modbus/ModbusRTUMaster.cc

@@ -36,6 +36,7 @@ namespace uniset
 	{
 		if( use485 )
 		{
+#ifndef DISABLE_COMPORT_485F
 			ComPort485F* cp;
 
 			if( dev == "/dev/ttyS2" )
@@ -46,6 +47,9 @@ namespace uniset
 				throw Exception("Open ComPort FAILED! dev must be /dev/ttyS2 or /dev/tytS3");
 
 			port = cp;
+#else
+			throw Exception("Open ComPort485F FAILED! DISABLE_COMPORT_485F");
+#endif // #ifndef DISABLE_COMPORT_485F
 		}
 		else
 			port = new ComPort(dev);

src/Communications/Modbus/ModbusRTUSlave.cc

@@ -36,6 +36,7 @@ namespace uniset
 	{
 		if( use485 )
 		{
+#ifndef DISABLE_COMPORT_485F
 			ComPort485F* cp;
 
 			if( dev == "/dev/ttyS2" )
@@ -46,6 +47,9 @@ namespace uniset
 				throw Exception("Open ComPort FAILED! dev must be /dev/ttyS2 or /dev/tytS3");
 
 			port = cp;
+#else
+			throw Exception("Open ComPort485F FAILED! DISABLE_COMPORT_485F");
+#endif // #ifndef DISABLE_COMPORT_485F
 		}
 		else
 			port = new ComPort(dev);