From 76094fab26228811a7b18b3402785c1972d5fb01 Mon Sep 17 00:00:00 2001 From: Davide Scola Date: Wed, 28 Feb 2018 09:25:40 +0000 Subject: [PATCH 1/3] do not perform x86 features check on non-x86 architectures --- configure.ac | 26 ++++++++++++++++++++++++-- m4/Makefile.am | 3 +-- m4/ax_enable_x86_features.m4 | 26 -------------------------- 3 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 m4/ax_enable_x86_features.m4 diff --git a/configure.ac b/configure.ac index c09f739..ec8026e 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([include/io.h]) AC_CONFIG_HEADERS([config.h]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-xz]) AX_IS_RELEASE([git-directory]) @@ -123,7 +123,6 @@ AX_C99_INLINE AX_GCC_FUNC_ATTRIBUTE([always_inline]) AX_COMPILER_FLAGS AX_GCC_ARCHFLAG -AX_ENABLE_X86_FEATURES dnl -------------------------------------------------------------------- dnl Checks for library functions. @@ -143,6 +142,29 @@ dnl Checks for user defined options. dnl -------------------------------------------------------------------- AX_MSG_BOLD([Checking user defined options]) +AC_ARG_ENABLE([x86-features], AC_HELP_STRING([--enable-x86-features], + [Enable the x86 features check @<:@default=yes@:>@]), + [ax_cv_enable_x86_features="${enableval}"], [ax_cv_enable_x86_features='yes']) + +AC_MSG_CHECKING([whether you want to enable the x86 features check]) + +if test "x${ax_cv_enable_x86_features}" = 'xyes'; then + AC_MSG_RESULT([yes]) + + case "${target}" in + i?86-* | amd64-* | x86_64-*) + AX_CHECK_X86_FEATURES + ;; + *) + ax_cv_enable_x86_features='no' + AC_MSG_WARN([the x86 features check cannot be performed]) + ;; + esac +else + AC_MSG_RESULT([no]) + ax_cv_enable_x86_features='no' +fi + AX_DEFINE_DESCRIPTOR([SKEY_FILENO], [secret key], [6]) AX_DEFINE_DESCRIPTOR([PKEY_FILENO], [public key], [7]) AX_DEFINE_DESCRIPTOR([SIGN_FILENO], [signature], [8]) diff --git a/m4/Makefile.am b/m4/Makefile.am index 501f75d..187d1bb 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -44,8 +44,7 @@ ax_gcc_x86_cpuid.m4 \ ax_compiler_vendor.m4 \ ax_gcc_archflag.m4 \ ax_gcc_x86_cpu_supports.m4 \ -ax_check_x86_features.m4 \ -ax_enable_x86_features.m4 +ax_check_x86_features.m4 MAINTAINERCLEANFILES = \ libtool.m4 \ diff --git a/m4/ax_enable_x86_features.m4 b/m4/ax_enable_x86_features.m4 deleted file mode 100644 index c72b62b..0000000 --- a/m4/ax_enable_x86_features.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl @synopsis AX_ENABLE_X86_FEATURES([foo], [bar]) -dnl -dnl Macro to conditionally enable the x86 features check. -dnl -dnl Examples: -dnl AX_ENABLE_X86_FEATURES -dnl AX_ENABLE_X86_FEATURES([foo], [bar]) -dnl -dnl @category Misc -dnl @author Davide Scola -dnl @version 2017-11-09 -dnl @license AllPermissive - -AC_DEFUN([AX_ENABLE_X86_FEATURES], [ - AC_ARG_ENABLE([x86-features], AC_HELP_STRING([--enable-x86-features], - [Enable the x86 features check @<:@default=yes@:>@]), - [ax_cv_enable_x86_features="${enableval}"], [ax_cv_enable_x86_features='yes']) - - AC_MSG_CHECKING([whether you want to enable the x86 features check]) - - AS_IF([test "x${ax_cv_enable_x86_features}" = 'xyes'], [ - AC_MSG_RESULT([yes]) - AX_CHECK_X86_FEATURES([$1], [$2])], [ - AC_MSG_RESULT([no]) - ]) -])dnl AX_ENABLE_X86_FEATURES From b2175d633e597ba353bbe9d8fab9e2137df939b6 Mon Sep 17 00:00:00 2001 From: Davide Scola Date: Wed, 28 Feb 2018 09:29:12 +0000 Subject: [PATCH 2/3] grenache-lookup has been added to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a20b623..e65eb08 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ grc-keygen grenache-get grenache-put grenache-keygen +grenache-lookup # # Distribution From da1f1c06c61dd262246bbe0047034e29cdc1e58c Mon Sep 17 00:00:00 2001 From: Davide Scola Date: Wed, 28 Feb 2018 09:36:19 +0000 Subject: [PATCH 3/3] bump version to 0.4.1 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ec8026e..f84500d 100644 --- a/configure.ac +++ b/configure.ac @@ -15,9 +15,9 @@ dnl implied. See the License for the specific language governing permissions dnl and limitations under the License. AC_PREREQ(2.69) -AC_INIT([grenache-cli], [0.4.0], [davide@bitfinex.com]) +AC_INIT([grenache-cli], [0.4.1], [davide@bitfinex.com]) -AC_SUBST([VERSION], [0.4.0]) +AC_SUBST([VERSION], [0.4.1]) AC_SUBST([SB], [`$srcdir/shtool echo -n -e %B`]) AC_SUBST([EB], [`$srcdir/shtool echo -n -e %b`])