Builds comp.libs from VCS

... fails on DUMA because it cannot be compiled by newer C++, and patches
are not applied to checkouts from VCS.

Signed-off-by: Alexey Neyman <stilor@att.net>

11 files changed, 65 insertions, 10 deletions

diff --git a/maintainer/gen-versions.sh b/maintainer/gen-versions.sh
index 325715a..099cdae 100755
--- a/maintainer/gen-versions.sh
+++ b/maintainer/gen-versions.sh
@@ -437,6 +437,8 @@ enter_fork()
     info[repository]=
     info[repository_branch]=
     info[repository_cset]=
+    info[repository_subdir]=
+    info[bootstrap]=
     info[fork]=${fork}
     info[name]=${fork}
     info[mirrors]=
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index b3e8a90..c8dfed7 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -131,6 +131,23 @@ config @@pfx@@_DEVEL_REVISION
       CVS: enter the date in "YYYY/MM/DD HH:MM:SS" format (UTC) to check out certain date.
       Subversion: enter the revision.
 
+config @@pfx@@_DEVEL_SUBDIR
+    string "Subdirectory in the repository"
+    default "@@repository_subdir@@"
+    help
+      Some projects produce releases not from the top-level directory in the
+      repository, but rather from some subdirectory. If it is the case,
+      specify this subdirectory here.
+
+config @@pfx@@_DEVEL_BOOTSTRAP
+    string "Bootstrap command"
+    default "@@bootstrap@@"
+    help
+      Command to run after checking out. Some projects don't store the generated
+      files like configure script in the repository; building out of a checked out
+      working copy thus requires some extra steps. Separate multiple shell commands
+      with &&.
+
 endif
 
 config @@pfx@@_SRC_CUSTOM
diff --git a/packages/expat/package.desc b/packages/expat/package.desc
index d1bfcf9..585ce5e 100644
--- a/packages/expat/package.desc
+++ b/packages/expat/package.desc
@@ -1,2 +1,4 @@
 repository='git https://github.com/libexpat/libexpat.git'
+repository_subdir='expat'
+bootstrap='./buildconf.sh && make -C doc all'
 mirrors='http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}'
diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc
index ccd9f2f..065e790 100644
--- a/packages/gettext/package.desc
+++ b/packages/gettext/package.desc
@@ -1,2 +1,5 @@
 repository='git https://git.savannah.gnu.org/git/gettext.git'
+# TBD autogen.sh will check out most recent gnulib - need to make gnulib
+# a separate package and depend on it in case of devel builds?
+bootstrap='./autogen.sh'
 mirrors='$(CT_Mirrors GNU gettext)'
diff --git a/packages/gmp/package.desc b/packages/gmp/package.desc
index a7ed6ef..eed0d3c 100644
--- a/packages/gmp/package.desc
+++ b/packages/gmp/package.desc
@@ -1,3 +1,4 @@
 repository='hg https://gmplib.org/repo/gmp/'
+bootstrap='./.bootstrap'
 mirrors='https://gmplib.org/download/gmp $(CT_Mirrors GNU gmp)'
 milestones='5.1'
diff --git a/packages/isl/package.desc b/packages/isl/package.desc
index e328b88..e4904d5 100644
--- a/packages/isl/package.desc
+++ b/packages/isl/package.desc
@@ -1,3 +1,4 @@
 repository='git git://repo.or.cz/isl.git'
+bootstrap='./autogen.sh'
 mirrors='http://isl.gforge.inria.fr'
 milestones='0.12 0.14'
diff --git a/packages/libiconv/package.desc b/packages/libiconv/package.desc
index b733bae..f75054a 100644
--- a/packages/libiconv/package.desc
+++ b/packages/libiconv/package.desc
@@ -1,2 +1,5 @@
 repository='git https://git.savannah.gnu.org/git/libiconv.git'
+# TBD autogen.sh will check out most recent gnulib - need to make gnulib
+# a separate package and depend on it in case of devel builds?
+bootstrap='./autogen.sh'
 mirrors='$(CT_Mirrors GNU libiconv)'
diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc
index c368160..8eba114 100644
--- a/packages/mpc/package.desc
+++ b/packages/mpc/package.desc
@@ -1,2 +1,3 @@
 repository='git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git'
+bootstrap='autoreconf -i'
 mirrors='http://www.multiprecision.org/mpc/download $(CT_Mirrors GNU mpc)'
diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc
index 1eacb98..afab5e5 100644
--- a/packages/mpfr/package.desc
+++ b/packages/mpfr/package.desc
@@ -1,2 +1,4 @@
 repository='svn https://scm.gforge.inria.fr/anonscm/svn/mpfr'
+# TBD: meta-package autoconf-archive to install extra m4's
+bootstrap='wget -O m4/ax_pthread.m4 \\"http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_pthread.m4\\" && ./autogen.sh'
 mirrors='http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)'
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index d40faba..bd07c6b 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -245,12 +245,14 @@ CT_DoForceRmdir "${CT_BUILD_DIR}" "${CT_BUILDTOOLS_PREFIX_DIR}"
 
 # Don't eradicate directories if we need to restart
 if [ -z "${CT_RESTART}" ]; then
+    # Per-target sources: eliminate
+    CT_DoForceRmdir "${CT_SRC_DIR}"
     # Get rid of pre-existing installed toolchain and previous build directories.
     if [ "${CT_FORCE_DOWNLOAD}" = "y" -a -d "${CT_TARBALLS_DIR}" ]; then
         CT_DoForceRmdir "${CT_TARBALLS_DIR}"
     fi
-    if [ "${CT_FORCE_EXTRACT}" = "y" -a -d "${CT_SRC_DIR}" ]; then
-        CT_DoForceRmdir "${CT_SRC_DIR}"
+    if [ "${CT_FORCE_EXTRACT}" = "y" -a -d "${CT_COMMON_SRC_DIR}" ]; then
+        CT_DoForceRmdir "${CT_COMMON_SRC_DIR}"
     fi
     if [ -d "${CT_PREFIX_DIR}" -a "${CT_RM_RF_PREFIX_DIR}" = "y" ]; then
         CT_DoForceRmdir "${CT_PREFIX_DIR}"
@@ -265,6 +267,7 @@ fi
 # create already existent directories, and CT_BUILD_DIR needs to be created
 # anyway
 CT_DoExecLog ALL mkdir -p "${CT_TARBALLS_DIR}"
+CT_DoExecLog ALL mkdir -p "${CT_COMMON_SRC_DIR}"
 CT_DoExecLog ALL mkdir -p "${CT_SRC_DIR}"
 CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}"
 CT_DoExecLog ALL mkdir -p "${CT_BUILDTOOLS_PREFIX_DIR}/bin"
diff --git a/scripts/functions b/scripts/functions
index 091b202..b1c8be1 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1546,7 +1546,9 @@ CT_Download_cvs()
     # TBD try -'d ${basename}', with/without -N
     CT_DoExecLog ALL cvs -z 9 -d "${pserver}" co -P ${devel_branch:+-r ${devel_branch}} \
             -D "${devel_revision} UTC" "${module}"
-    CT_DoExecLog ALL mv "${module}" "${basename}"
+    if [ "${module}" != "${pkg_name}" ]; then
+        CT_DoExecLog ALL mv "${module}" "${pkg_name}"
+    fi
 }
 
 # Find the most recent version from Subversion. 
@@ -1572,7 +1574,7 @@ CT_GetVersion_svn()
 # Retrieve sources from Subversion.
 CT_Download_svn()
 {
-    CT_DoExecLog ALL svn export -r "${devel_revision}" "${devel_url}${devel_branch}" "${basename}"
+    CT_DoExecLog ALL svn export -r "${devel_revision}" "${devel_url}${devel_branch}" "${pkg_name}"
 }
 
 # Find the most recent version from Mercurial.
@@ -1614,7 +1616,6 @@ CT_Download_hg()
     fi
     CT_DoExecLog ALL rm -rf .hg
     CT_Popd
-    CT_DoExecLog ALL mv "${pkg_name}" "${basename}"
 }
 
 # Get the most recent version from Git.
@@ -1646,8 +1647,8 @@ CT_GetVersion_git()
 # Retrieve sources from Git.
 CT_Download_git()
 {
-    CT_DoExecLog ALL git clone "${devel_url}" "${basename}"
-    CT_Pushd "${basename}"
+    CT_DoExecLog ALL git clone "${devel_url}" "${pkg_name}"
+    CT_Pushd "${pkg_name}"
     CT_DoExecLog ALL git checkout "${devel_revision}" --
     CT_DoExecLog ALL rm -rf .git
     CT_Popd
@@ -1673,7 +1674,8 @@ CT_PackageRun()
 
     # Variables that are per-fork
     for v in basename pkg_name version src_release mirrors src_devel src_custom \
-            devel_vcs devel_url devel_branch devel_revision custom_location; do
+            devel_vcs devel_url devel_branch devel_revision devel_subdir devel_bootstrap \
+            custom_location; do
         eval "local ${v}=\${CT_${use}_${v^^}}"
     done
 
@@ -1708,7 +1710,7 @@ CT_DoFetch()
         # - CT_GetVersion_xxx that sets the base name for the package (package name
         #   and some unique identifier for the version)
         # - CT_Download_xxx that retrieves the sources into the directory named as
-        #   ${basename}
+        #   ${pkg_name}
         # Both these methods can also modify devel_branch/devel_revision. Typically,
         # this would override empty (default) values with "default branch name" and
         # "most current revision", respectively.
@@ -1734,6 +1736,23 @@ CT_DoFetch()
         CT_MktempDir tmp_dir
         CT_Pushd "${tmp_dir}"
         CT_Download_${devel_vcs}
+        CT_DoExecLog ALL mv "${pkg_name}${devel_subdir:+/${devel_subdir}}" "${basename}"
+
+        # Post-download scripts.
+        # FIXME: This currently means we end up using host's autotools,
+        # but changing this requires reworking the order of operations in crosstool-NG:
+        # we'd need to defer the download/extraction/patching of a package until after
+        # the companion tools are built.
+        local remains="${devel_bootstrap}"
+        while [ -n "${remains}" ]; do
+            CT_Pushd "${basename}"
+            CT_DoExecLog ALL ${remains%%&&*}
+            case "${remains}" in
+            *\&\&*) remains="${remains#*&&}";;
+            *) remains=;;
+            esac
+            CT_Popd
+        done
         CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${basename}.tar.bz2" "${basename}"
         CT_SaveLocal "${CT_TARBALLS_DIR}/${basename}.tar.bz2"
         CT_Popd
@@ -1805,7 +1824,6 @@ CT_DoExtractPatch()
     local bundled_patch_dir
     local local_patch_dir
 
-    CT_DoLog EXTRA "Extracting ${basename}"
     if [ "${src_custom}" != "y" ]; then
         # Non-custom: extract to shared location
         # If the previous extraction/patching was aborted, clean up.
@@ -1819,6 +1837,7 @@ CT_DoExtractPatch()
         if [ -f "${CT_COMMON_SRC_DIR}/.${basename}.extracted" ]; then
             CT_DoLog DEBUG "Already extracted ${basename}"
         else
+            CT_DoLog EXTRA "Extracting ${basename}"
             CT_DoExecLog ALL touch "${CT_COMMON_SRC_DIR}/.${basename}.extracting"
             # TBD save/discover the extension while fetching
             ext=`CT_GetFileExtension "${basename}"`
@@ -1859,6 +1878,7 @@ CT_DoExtractPatch()
                 fi
             done
  
+            # TBD meta-package for config.sub/config.guess with replacement script
             if [ "${CT_OVERRIDE_CONFIG_GUESS_SUB}" = "y" ]; then
                 CT_DoLog ALL "Overiding config.guess and config.sub"
                 for cfg in config.guess config.sub; do