X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fbld_scripts%2Fbld_dynamic.sh;h=40fd50ab757831744af35f37784f99970e5d6b75;hb=e55a625a562bc3ad94deb8008c7ede2bf1768daa;hp=fdf546798fa8b52e78c9a15164a444be9123c0c0;hpb=5820b5f022aeec75ec03f7dd0121aa8a3d7f7590;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/bld_scripts/bld_dynamic.sh b/cinelerra-5.1/bld_scripts/bld_dynamic.sh index fdf54679..40fd50ab 100755 --- a/cinelerra-5.1/bld_scripts/bld_dynamic.sh +++ b/cinelerra-5.1/bld_scripts/bld_dynamic.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x dir="$1" shift @@ -13,31 +13,24 @@ if [ ! -d "$path/$dir/$bld" ]; then fi cd "$path/$dir/$bld" -rm -rf "$proj" -git clone --depth 1 "git://git.cinelerra-cv.org/goodguy/cinelerra.git" "$proj" -#rsh host tar -C /mnt0/cinelerra5 -cf - cinelerra | tar -xf - -#mv cinelerra cinelerra5 +rm -rf "$proj.dyn" +mkdir "$proj.dyn" + +git clone "git://git.cinelerra-cv.org/goodguy/cinelerra.git" "$proj.dyn" +#rsh host tar -C "/mnt0/$proj" -cf - "$base" | tar -C "$proj.dyn" -xf - if [ $? -ne 0 ]; then echo "git clone $proj failed" exit 1 fi -cd "$proj/$base" -if [ "$dir" = "ubuntu" ]; then - echo "CFLAGS += -DPNG_SKIP_SETJMP_CHECK=1" >> global_config -fi -if [ "$dir" = "centos" ]; then - echo "EXTRA_LIBS += -lnuma" >> global_config - echo "CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS" >> global_config -fi -if [ "$dir" = "suse" ]; then - echo "EXTRA_LIBS += -lnuma" >> global_config -fi - -STATIC_LIBRARIES=0 ./configure >& log -make >> log 2>&1 $@ -make install >> log 2>&1 +cd "$proj.dyn/$base" +{ +./autogen.sh && \ +./configure --with-single-user --disable-static-build && \ +make $@ && \ +make install +} 2>&1 | tee log || true echo "finished: scanning log for ***" -grep -ai "\*\*\*.*error" log +grep -ai "\*\*\*.*error" log | head