mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: drop no longer working --with-linked-git option

Browse Source 
--with-referenced-git works with submodules, --with-linked-git does not.
And I don't see a way to fix it, either.

Change-Id: Ib6cdb065a022665cd62e9fdc7fc37a9e916e50ad
Reviewed-on: https://gerrit.libreoffice.org/2165
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
This commit is contained in:
Miklos Vajna
2013-02-15 11:42:59 +01:00
parent 346b64473a
commit f6251134c9
3 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@@ -222,15 +222,7 @@ fetch: get-submodules
ifneq (,$(wildcard $(SRCDIR)/.git))
get-submodules:
ifneq ($(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git),$(wildcard $(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git)))
ifeq (,$(GIT_LINK_SRC))
cd $(SRCDIR) && ./g -f clone
else # space-saving clone from another local workdir
@echo "FIXME: GIT_LINK_SRC method is not yet implemented with submodules" 1>&2
true $(foreach i,$(GIT_NEEDED_SUBMODULES),\
&& rm -r $(i) && cp -R $(GIT_LINK_SRC)/$(i) $(i))
# bin/git-new-workdir $GIT_LINK_SRC/$i $i
git submodule update $(GIT_NEEDED_SUBMODULES)
endif
endif
@cd $(SRCDIR) && ./g -z # make sure the git hooks are in place enen if no submodules are needed

1
config_host.mk.in
View File

@@ -188,7 +188,6 @@ export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@

19
configure.ac
View File

@@ -1194,14 +1194,6 @@ AC_ARG_WITH(solver-and-workdir-root,
[Specify path that contains SOLARVER and WORKDIR directories manually.])
)
AC_ARG_WITH(linked-git,
AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
[Specify another checkout's clonedir to re-use. This makes use of
git-new-workdir, and saves a lot of diskspace when having multiple
trees side-by-side.]),
GIT_LINK_SRC=$withval ,
)
AC_ARG_WITH(referenced-git,
AS_HELP_STRING([--with-referenced-git=<OTHER_CHECKOUT_DIR>],
[Specify another checkout directory to reference. This makes use of
@@ -11945,17 +11937,6 @@ fi
AC_SUBST(L10N_MODULE)
AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
dnl git-new-workdir
dnl ===================================================================
if test -n "${GIT_LINK_SRC}"; then
for repo in ${GIT_NEEDED_SUBMODULES}; do
if ! test -d "${GIT_LINK_SRC}"/${repo}; then
AC_MSG_ERROR([linked git: required repository does not exist: ${GIT_LINK_SRC}/${repo}])
fi
done
fi
AC_SUBST(GIT_LINK_SRC)
dnl git submodule update --reference
dnl ===================================================================
if test -n "${GIT_REFERENCE_SRC}"; then