Skip to content

Commit 9fc635b

Browse files
committed
fix dysectapi subdir-objects warning from automake
1 parent ee28d50 commit 9fc635b

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ before_install:
5555
- eval $(./scripts/travis-dep-builder.sh --printenv)
5656
# travis has a 50 minute timeout for any single command, so we break up the build so it will partially cache as needed. ompi+other can be done in one session, dyninst requires its own.
5757
# - ./scripts/travis-dep-builder.sh --cachedir=$HOME/local/.cache --components=ompi
58-
# - ./scripts/travis-dep-builder.sh --cachedir=$HOME/local/.cache --components=impi
59-
# - ./scripts/travis-dep-builder.sh --cachedir=$HOME/local/.cache --components=other
60-
# - ./scripts/travis-dep-builder.sh --cachedir=$HOME/local/.cache --components=dyninst
58+
- ./scripts/travis-dep-builder.sh --cachedir=$HOME/local/.cache --components=impi
59+
- ./scripts/travis-dep-builder.sh --cachedir=$HOME/local/.cache --components=other
60+
- ./scripts/travis-dep-builder.sh --cachedir=$HOME/local/.cache --components=dyninst
6161

6262
script:
6363
- source $HOME/local/bin/mpivars.sh

scripts/travis-dep-builder.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ for pkg in $downloads; do
159159
cmake_opts="${extra_cmake_opts[$name]}"
160160
configure_opts="${extra_configure_opts[$name]}"
161161
cache_name="$name:$sha1:$make_opts:$configure_opts:$cmake_opts"
162-
if check_cache "$name"; then
163-
say "Using cached version of ${name}"
164-
continue
165-
fi
162+
# if check_cache "$name"; then
163+
# say "Using cached version of ${name}"
164+
# continue
165+
# fi
166166
export CC=gcc
167167
export CXX=g++
168168
gcc --version
@@ -195,7 +195,7 @@ EOF
195195
fi
196196
if test "$name" = "v9.3.2"; then
197197
export VERBOSE=1
198-
rm -f ${prefix}/lib/libiberty.a
198+
# rm -f ${prefix}/lib/libiberty.a
199199
fi
200200
mkdir -p ${name} || die "Failed to mkdir ${name}"
201201
(
@@ -223,19 +223,19 @@ EOF
223223
wget https://github.com/open-mpi/ompi/pull/3709.patch
224224
patch -p1 < 3709.patch
225225
fi
226-
# if test "$name" = "v9.3.2"; then
227-
# # parallel build of dyninst was causing travis error:
228-
# # No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.
229-
# make PREFIX=${prefix}
230-
# make PREFIX=${prefix} install
226+
if test "$name" = "v9.3.2"; then
227+
# parallel build of dyninst was causing travis error:
228+
# No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.
229+
make PREFIX=${prefix}
230+
make PREFIX=${prefix} install
231231
# elif test "$name" = "v5.0.1"; then
232232
# # parallel build of mrnet fails to find libxplat
233233
# make PREFIX=${prefix}
234234
# make PREFIX=${prefix} install
235-
# else
235+
else
236236
make -j 32 PREFIX=${prefix}
237237
make -j 32 PREFIX=${prefix} install
238-
# fi
238+
fi
239239
if test "$name" = "launchmon-v1.0.2"; then
240240
pushd test/src
241241
echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
@@ -288,10 +288,10 @@ for url in $checkouts; do
288288
cmake_opts="${extra_cmake_opts[$name]}"
289289
configure_opts="${extra_configure_opts[$name]}"
290290
cache_name="$name:$sha1:$make_opts:$configure_opts:$cmake_opts"
291-
if check_cache "$cache_name"; then
292-
say "Using cached version of ${name}"
293-
continue
294-
fi
291+
# if check_cache "$cache_name"; then
292+
# say "Using cached version of ${name}"
293+
# continue
294+
# fi
295295
git clone ${url} ${name} || die "Failed to clone ${url}"
296296
(
297297
cd ${name} || die "cd failed"

src/dysect/DysectAPI/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# what flags you want to pass to the C compiler & linker
22
AM_CXXFLAGS = -DSTAT_PREFIX=\"$(prefix)\"
33
AM_LDFLAGS =
4+
AUTOMAKE_OPTIONS = subdir-objects
45

56
include_HEADERS=DysectAPI.h
67
lib_LTLIBRARIES = libDysectAPIFE.la libDysectAPIBE.la libDysectAPIFD.la

0 commit comments

Comments
 (0)