Get jenkins_build.sh to use make -j instead of make -j4

v0.27.3
Robin Mills 10 years ago
parent ad8d5f711f
commit 29f75b529b

@ -146,9 +146,9 @@ case "$build" in
UNIX) UNIX)
echo ./configure --prefix=$PWD/usr $withcurl $withssh echo ./configure --prefix=$PWD/usr $withcurl $withssh
./configure "--prefix=$PWD/usr" $withcurl $withssh ./configure "--prefix=$PWD/usr" $withcurl $withssh
make -j4 "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs" make -j "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs"
make install make install
make -j4 samples "CXXFLAGS=-I${PWD}/usr/include -I${PWD}/src" "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs -lexiv2" make -j samples "CXXFLAGS=-I${PWD}/usr/include -I${PWD}/src" "LDFLAGS=-L${PWD}/usr/lib -L${PWD}/xmpsdk/src/.libs -lexiv2"
result=$? result=$?
run_tests run_tests
"$PWD/usr/bin/exiv2" -v -V "$PWD/usr/bin/exiv2" -v -V
@ -167,9 +167,9 @@ case "$build" in
rm -rf config.log config.status rm -rf config.log config.status
echo ./configure ${withcurl} ${withssh} --disable-nls echo ./configure ${withcurl} ${withssh} --disable-nls
./configure ${withcurl} ${withssh} --disable-nls ./configure ${withcurl} ${withssh} --disable-nls
make -j4 make -j
make install make install
make -j4 samples make -j samples
run_tests run_tests
/usr/local/bin/exiv2 -v -V /usr/local/bin/exiv2 -v -V
result=$? result=$?
@ -215,7 +215,7 @@ case "$build" in
fi fi
./configure $withcurl $withssh ./configure $withcurl $withssh
make # DO NOT USE -j4. It seems to hang the build! make # DO NOT USE -j. It seems to hang the build!
make install make install
make samples make samples
run_tests run_tests

Loading…
Cancel
Save