[oe-commits] [meta-openembedded] 63/67: autotools-bootstrap: don't fake submodule to avoid gnulib download

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit d889a8bfaf9f874b6e7da1a773f324ecd235b204
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
AuthorDate: Thu Mar 31 15:38:02 2016 -0400

    autotools-bootstrap: don't fake submodule to avoid gnulib download
    
    We were creating a .gitmodules on the fly to avoid downloading the
    gnulib via git.  However this is problematic if the pkg had its own
    .gitmodules already -- we'd clobber it and this breaks netcf build:
    
       ./bootstrap: getting gnulib files...
       error: pathspec 'gnulib' did not match any file(s) known to git.
    
    There is a more proper way to do this:  bootstrap supports this:
    
     --no-git           do not use git to update gnulib.  Requires that
                        --gnulib-srcdir point to a correct gnulib snapshot
    
    and if we use that, we can use our sysroot copy of gnulib without
    having to fake a .gitmodules submodule file.  This keeps the build
    of netcf happy.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/classes/autotools-bootstrap.bbclass | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta-oe/classes/autotools-bootstrap.bbclass b/meta-oe/classes/autotools-bootstrap.bbclass
index 8d7af1b..cae0375 100644
--- a/meta-oe/classes/autotools-bootstrap.bbclass
+++ b/meta-oe/classes/autotools-bootstrap.bbclass
@@ -7,18 +7,13 @@ do_configure_prepend() {
     currdir=`pwd`
     cd ${S}
 
-    # avoid bootstrap cloning gnulib on every configure
-    cat >.gitmodules <<EOF
-[submodule "gnulib"]
-	path = gnulib
-	url = git://git.sv.gnu.org/gnulib
-EOF
+    # avoid bootstrap cloning gnulib on every configure, hence "--no-git".
     cp -rf ${STAGING_DATADIR}/gnulib ${S}
 
     # --force to avoid errors on reconfigure e.g if recipes changed we depend on
     # | bootstrap: running: libtoolize --quiet
     # | libtoolize:   error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite
     # | ...
-    ./bootstrap --force
+    ./bootstrap --force --no-git --gnulib-srcdir=gnulib
     cd $currdir
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.