Skip to content

Commit 161aa5c

Browse files
committedMay 18, 2017
configure: Remove AX_VALGRIND_DFLT references
AX_VALGRIND_DFLT makes it imposible to build cc-oci-runtime in older distros. Hence we need to disable this checks in order to build successfuly on Ubuntu 16.04, Ubuntu 16.10 and Fedora 24. Added --disable-valgrind-sgcheck to default build options Fixes intel#888 and intel#887 Signed-off-by: Geronimo Orozco <[email protected]>
1 parent 61e9dbc commit 161aa5c

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed
 

‎.ci/ci-configure.sh

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ configure_opts+=" --enable-valgrind"
5757
configure_opts+=" --disable-valgrind-helgrind"
5858
configure_opts+=" --disable-valgrind-drd"
5959
configure_opts+=" --disable-silent-rules"
60+
configure_opts+=" --disable-valgrind-sgcheck"
6061

6162
if [ "$nested" = "Y" ]
6263
then

‎Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
156156
--enable-valgrind \
157157
--disable-valgrind-helgrind \
158158
--disable-valgrind-drd \
159+
--disable-valgrind-sgcheck \
159160
--enable-code-coverage \
160161
--enable-functional-tests \
161162
--with-systemdsystemunitdir=/tmp/cc-distcheck/systemdunitdir/

‎autogen.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ autoreconf --force --install --symlink --warnings=all
2929
args="\
3030
--sysconfdir=/etc \
3131
--localstatedir=/var \
32-
--prefix=/usr"
32+
--prefix=/usr \
33+
--disable-valgrind-sgcheck"
3334

3435
set -x
3536
./configure $args "$@"

‎configure.ac

-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ AC_DEFUN_ONCE([MACRO_CHECK],
3838
ifdef([$1], true, [AC_FATAL([Please install autoconf-archive],)])
3939
])
4040

41-
MACRO_CHECK([AX_VALGRIND_DFLT])
4241
MACRO_CHECK([AX_VALGRIND_CHECK])
4342
MACRO_CHECK([AX_CODE_COVERAGE])
4443

@@ -375,7 +374,6 @@ AC_ARG_ENABLE([autogopath],
375374
)
376375
AM_CONDITIONAL([AUTOGOPATH], [test x$autogopath = xtrue])
377376

378-
AX_VALGRIND_DFLT([sgcheck], [off])
379377
AX_VALGRIND_CHECK
380378
AX_CODE_COVERAGE
381379

0 commit comments

Comments
 (0)