small fixes to allow using --with-linked-git & --with-external-tar
This commit is contained in:
parent
6e56de169d
commit
cca3388bd4
3 changed files with 8 additions and 3 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -32,6 +32,7 @@
|
||||||
/visibility.cxx
|
/visibility.cxx
|
||||||
/post_download
|
/post_download
|
||||||
/bin/repo-list
|
/bin/repo-list
|
||||||
|
/src.downloaded
|
||||||
|
|
||||||
# misc
|
# misc
|
||||||
/set_soenv.last
|
/set_soenv.last
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
SHELL=/usr/bin/env bash
|
SHELL=/usr/bin/env bash
|
||||||
|
|
||||||
all: Makefile dmake/dmake@EXEEXT@ fetch
|
all: Makefile dmake/dmake@EXEEXT@ src.downloaded
|
||||||
@. ./*[Ee]nv.[Ss]et.sh && \
|
@. ./*[Ee]nv.[Ss]et.sh && \
|
||||||
cd instsetoo_native && \
|
cd instsetoo_native && \
|
||||||
build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
|
build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
|
||||||
|
@ -34,11 +34,11 @@ dmake/dmake@EXEEXT@:
|
||||||
@. ./*[Ee]nv.[Ss]et.sh && \
|
@. ./*[Ee]nv.[Ss]et.sh && \
|
||||||
./bootstrap
|
./bootstrap
|
||||||
|
|
||||||
src/downloaded: ooo.lst download
|
src.downloaded: ooo.lst download
|
||||||
@. ./*[Ee]nv.[Ss]et.sh && \
|
@. ./*[Ee]nv.[Ss]et.sh && \
|
||||||
$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
|
$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
|
||||||
|
|
||||||
fetch: src/downloaded
|
fetch: src.downloaded
|
||||||
|
|
||||||
Makefile: configure.in set_soenv.in Makefile.in
|
Makefile: configure.in set_soenv.in Makefile.in
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
|
4
download
4
download
|
@ -42,6 +42,9 @@ if [ -d .git ] ; then
|
||||||
mkdir clone
|
mkdir clone
|
||||||
for i in $GIT_REPO_NAMES ; do
|
for i in $GIT_REPO_NAMES ; do
|
||||||
bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
|
bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
|
||||||
|
for i in clone/$i/* ; do
|
||||||
|
ln -sf $i $(basename $i)
|
||||||
|
done
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -229,3 +232,4 @@ fi
|
||||||
[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
|
[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
|
||||||
|
|
||||||
./post_download || exit 1
|
./post_download || exit 1
|
||||||
|
# vim:set shiftwidth=4 softtabstop=4 expandtab:
|
||||||
|
|
Loading…
Reference in a new issue