[PATCH 0 of 1] Add autoconf as a compantion tool

[PATCH 0 of 1] Add autoconf as a compantion tool

[Richard Strand]

Hi Yann, All,

This patch is an inital attempt at adding autoconf to make sure I have the
right idea.

This initial version builds autoconf so it is used when compiling the rest
of the toolchain. As it is needed for the patch stage for a number of the
tools I have to compile and install it outside of the standard steps cycle.

So it can be used afterwards with the toolchain should I add a symlink to the
{CT_PREFIX_DIR}/bin (maybe an option to do this in the config)?

I realise I haven't added any help items for the menuconfig but I wanted to
make sure the functionality was correct first.

Regards,

Richard Strand

--
For unsubscribe information see http://sourceware.org/lists.html#faq

[PATCH 1 of 1] companion_tools/autoconf: add autoconf tool

[Richard Strand]

# HG changeset patch
# User Richard Strand <richard.strand@icomera.com>
# Date 1263156224 0
# Node ID b571c9ad20d52f160f8c0ab0d5499b9ec3212498
# Parent  dbd5078816f93798b6811b82a900545f6d36035a
companion_tools/autoconf: add autoconf tool

Initial version of adding autoconf as a companion tool.

Signed-off-by: Richard Strand <richard.strand@icomera.com>

diff -r dbd5078816f9 -r b571c9ad20d5 config/companion_tools.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/companion_tools.in	Sun Jan 10 20:43:44 2010 +0000
@@ -0,0 +1,29 @@
+# Companion tools config options
+
+if EXPERIMENTAL
+
+menu "Companion tools"
+
+config COMP_TOOLS
+    bool
+    prompt "READ HELP before you say 'Y' here !!!"
+    help
+      No help yet - continue at your peril!
+
+if COMP_TOOLS
+
+config AUTOCONF
+    bool
+    prompt "autoconf"
+    help
+      No help yet
+
+if AUTOCONF
+source config/companion_tools/autoconf.in
+endif
+
+endif
+
+endmenu
+
+endif
diff -r dbd5078816f9 -r b571c9ad20d5 config/companion_tools/autoconf.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/companion_tools/autoconf.in	Sun Jan 10 20:43:44 2010 +0000
@@ -0,0 +1,19 @@
+# AUTOCONF options
+
+choice
+    bool
+    prompt "autoconf version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config AUTOCONF_V_2_65
+    bool
+    prompt "2.65"
+
+endchoice
+
+config AUTOCONF_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "2.65" if AUTOCONF_V_2_65
diff -r dbd5078816f9 -r b571c9ad20d5 config/config.in
--- a/config/config.in	Sun Jan 10 17:43:23 2010 +0100
+++ b/config/config.in	Sun Jan 10 20:43:44 2010 +0000
@@ -8,3 +8,4 @@
 source config/debug.in
 source config/tools.in
 source config/companion_libs.in
+source config/companion_tools.in
diff -r dbd5078816f9 -r b571c9ad20d5 scripts/build/companion_tools/autoconf.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/build/companion_tools/autoconf.sh	Sun Jan 10 20:43:44 2010 +0000
@@ -0,0 +1,32 @@
+# Build script for autoconf
+
+do_autoconf_get() { :; }
+do_autoconf_extract() { :; }
+do_autoconf() { :; }
+
+# Overide functions depending on configuration
+if [ "${CT_AUTOCONF}" = "y" ]; then
+
+do_autoconf_get() {
+    CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" {ftp,http}://ftp.gnu.org/gnu/autoconf/
+}
+
+do_autoconf_extract() {
+    CT_Extract "autoconf-${CT_AUTOCONF_VERSION}"
+    CT_Patch "autoconf-${CT_AUTOCONF_VERSION}"
+}
+
+do_autoconf() {
+    CT_DoStep INFO "Installing autoconf"
+    mkdir -p "${CT_BUILD_DIR}/build-autoconf"
+    CT_Pushd "${CT_BUILD_DIR}/build-autoconf"
+    CT_DoExecLog ALL ${CONFIG_SHELL} \
+    "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
+        --prefix="${CT_COMP_TOOLS_DIR}"
+    CT_DoExecLog ALL make
+    CT_DoExecLog ALL make install
+    CT_Popd
+    CT_EndStep
+}
+
+fi
diff -r dbd5078816f9 -r b571c9ad20d5 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Sun Jan 10 17:43:23 2010 +0100
+++ b/scripts/crosstool-NG.sh.in	Sun Jan 10 20:43:44 2010 +0000
@@ -126,6 +126,7 @@
 . "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh"
 . "${CT_LIB_DIR}/scripts/build/tools.sh"
 . "${CT_LIB_DIR}/scripts/build/debug.sh"
+. "${CT_LIB_DIR}/scripts/build/companion_tools/autoconf.sh"
 
 # Target tuple: CT_TARGET needs a little love:
 CT_DoBuildTargetTuple
@@ -504,6 +505,7 @@
         do_libc_get
         do_tools_get
         do_debug_get
+        do_autoconf_get
         CT_EndStep
     fi
 
@@ -512,6 +514,16 @@
             CT_DoForceRmdir "${CT_SRC_DIR}"
             CT_DoExecLog ALL mkdir -p "${CT_SRC_DIR}"
         fi
+
+        if [ "${CT_COMP_TOOLS}" = "y" ]; then
+          export CT_COMP_TOOLS_DIR="${CT_PREFIX_DIR}/companion_tools"
+          export PATH="${CT_COMP_TOOLS_DIR}/bin:${PATH}"
+          CT_DoStep INFO "Extracting, patching and installing companion tools"
+          do_autoconf_extract
+          do_autoconf
+          CT_EndStep
+        fi
+
         CT_DoStep INFO "Extracting and patching toolchain components"
         do_kernel_extract
         do_gmp_extract

--
For unsubscribe information see http://sourceware.org/lists.html#faq

Re: [PATCH 0 of 1] Add autoconf as a compantion tool

[Yann E. MORIN]

Richard, All,

On Sunday 10 January 2010 22:06:42 Richard Strand wrote:
> This patch is an inital attempt at adding autoconf to make sure I have the
> right idea.

I'll comment in the patch.

> This initial version builds autoconf so it is used when compiling the rest
> of the toolchain. As it is needed for the patch stage for a number of the
> tools I have to compile and install it outside of the standard steps cycle.

Yep, I had forgotten that. Nice you spot it!

> So it can be used afterwards with the toolchain should I add a symlink to the
> {CT_PREFIX_DIR}/bin (maybe an option to do this in the config)?

There's already ${CT_WORK_DIR}/bin in the PATH. Change that to be:
${CT_TARGET}/tools/bin (in a separate patch), and then install the
companion tools with --prefix="${CT_TARGET}/tools"

> I realise I haven't added any help items for the menuconfig but I wanted to
> make sure the functionality was correct first.

Yes, that's perfectly OK for now!

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
`------------------------------^-------^------------------^--------------------'



--
For unsubscribe information see http://sourceware.org/lists.html#faq

Re: [PATCH 1 of 1] companion_tools/autoconf: add autoconf tool

[Yann E. MORIN]

Richard, All,

On Sunday 10 January 2010 22:06:43 Richard Strand wrote:
> # HG changeset patch
> # User Richard Strand <richard.strand@icomera.com>
> # Date 1263156224 0
> # Node ID b571c9ad20d52f160f8c0ab0d5499b9ec3212498
> # Parent  dbd5078816f93798b6811b82a900545f6d36035a
> companion_tools/autoconf: add autoconf tool
> 
> Initial version of adding autoconf as a companion tool.

I will comment tomorrow, sorry... Globally OK, but needs some refinements...

Regards,
Yann E. MORIN.


-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
`------------------------------^-------^------------------^--------------------'



--
For unsubscribe information see http://sourceware.org/lists.html#faq

Re: [PATCH 1 of 1] companion_tools/autoconf: add autoconf tool

[Yann E. MORIN]

Richard, All,

On Sunday 10 January 2010 22:06:43 Richard Strand wrote:
> diff -r dbd5078816f9 -r b571c9ad20d5 config/companion_tools.in
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/config/companion_tools.in	Sun Jan 10 20:43:44 2010 +0000
> @@ -0,0 +1,29 @@
> +# Companion tools config options
> +
> +if EXPERIMENTAL

Yep, EXPERIMENTAL is OK.

> +menu "Companion tools"
> +
> +config COMP_TOOLS
> +    bool
> +    prompt "READ HELP before you say 'Y' here !!!"
> +    help
> +      No help yet - continue at your peril!
> +
> +if COMP_TOOLS
> +
> +config AUTOCONF
> +    bool
> +    prompt "autoconf"
> +    help
> +      No help yet
> +
> +if AUTOCONF
> +source config/companion_tools/autoconf.in
> +endif

No need for sub-files, see below.

> +endif
> +
> +endmenu
> +
> +endif
> diff -r dbd5078816f9 -r b571c9ad20d5 config/companion_tools/autoconf.in
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/config/companion_tools/autoconf.in	Sun Jan 10 20:43:44 2010 +0000
> @@ -0,0 +1,19 @@
> +# AUTOCONF options
> +
> +choice
> +    bool
> +    prompt "autoconf version"
> +# Don't remove next line
> +# CT_INSERT_VERSION_BELOW
> +
> +config AUTOCONF_V_2_65
> +    bool
> +    prompt "2.65"
> +
> +endchoice
> +
> +config AUTOCONF_VERSION
> +    string
> +# Don't remove next line
> +# CT_INSERT_VERSION_STRING_BELOW
> +    default "2.65" if AUTOCONF_V_2_65

We do not need to support multiple versions of the companion tools.
We're adding them just so the user does not need to update his/her system.
Just use what we need.

So, do not bother with a sub-file and sub-options, just hard-code the
strictly necessary stuff. Do not do any fancy config/options.

> diff -r dbd5078816f9 -r b571c9ad20d5 config/config.in
> --- a/config/config.in	Sun Jan 10 17:43:23 2010 +0100
> +++ b/config/config.in	Sun Jan 10 20:43:44 2010 +0000
> @@ -8,3 +8,4 @@
>  source config/debug.in
>  source config/tools.in
>  source config/companion_libs.in
> +source config/companion_tools.in

OK.

> diff -r dbd5078816f9 -r b571c9ad20d5 scripts/build/companion_tools/autoconf.sh
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/scripts/build/companion_tools/autoconf.sh	Sun Jan 10 20:43:44 2010 +0000
> @@ -0,0 +1,32 @@
> +# Build script for autoconf
> +
> +do_autoconf_get() { :; }
> +do_autoconf_extract() { :; }
> +do_autoconf() { :; }
> +
> +# Overide functions depending on configuration
> +if [ "${CT_AUTOCONF}" = "y" ]; then
> +
> +do_autoconf_get() {
> +    CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" {ftp,http}://ftp.gnu.org/gnu/autoconf/
> +}
> +
> +do_autoconf_extract() {
> +    CT_Extract "autoconf-${CT_AUTOCONF_VERSION}"
> +    CT_Patch "autoconf-${CT_AUTOCONF_VERSION}"
> +}
> +
> +do_autoconf() {
> +    CT_DoStep INFO "Installing autoconf"
> +    mkdir -p "${CT_BUILD_DIR}/build-autoconf"
> +    CT_Pushd "${CT_BUILD_DIR}/build-autoconf"
> +    CT_DoExecLog ALL ${CONFIG_SHELL} \
> +    "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
> +        --prefix="${CT_COMP_TOOLS_DIR}"
> +    CT_DoExecLog ALL make
> +    CT_DoExecLog ALL make install
> +    CT_Popd
> +    CT_EndStep
> +}
> +
> +fi

OK.

> diff -r dbd5078816f9 -r b571c9ad20d5 scripts/crosstool-NG.sh.in
> --- a/scripts/crosstool-NG.sh.in	Sun Jan 10 17:43:23 2010 +0100
> +++ b/scripts/crosstool-NG.sh.in	Sun Jan 10 20:43:44 2010 +0000
> @@ -126,6 +126,7 @@
>  . "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh"
>  . "${CT_LIB_DIR}/scripts/build/tools.sh"
>  . "${CT_LIB_DIR}/scripts/build/debug.sh"
> +. "${CT_LIB_DIR}/scripts/build/companion_tools/autoconf.sh"
>  
>  # Target tuple: CT_TARGET needs a little love:
>  CT_DoBuildTargetTuple
> @@ -504,6 +505,7 @@
>          do_libc_get
>          do_tools_get
>          do_debug_get
> +        do_autoconf_get

As for the config file, a single do_companion_tools_get() might be better
( a-la do_debug_get() ).
Also, the list is in the order components are being built, move the get to
the top of the list.

>          CT_EndStep
>      fi
>  
> @@ -512,6 +514,16 @@
>              CT_DoForceRmdir "${CT_SRC_DIR}"
>              CT_DoExecLog ALL mkdir -p "${CT_SRC_DIR}"
>          fi
> +
> +        if [ "${CT_COMP_TOOLS}" = "y" ]; then
> +          export CT_COMP_TOOLS_DIR="${CT_PREFIX_DIR}/companion_tools"

See my previous mail: ${CT_WORK_DIR}/tools
The tools are needed only at build-time, not at run-time.
See also around line 80 in scripts/crosstool-NG.sh.in:
  CT_BIN_OVERIDE_DIR="${CT_WORK_DIR}/bin"
change into:
  CT_BIN_OVERIDE_DIR="${CT_WORK_DIR}/tools/bin"

> +          export PATH="${CT_COMP_TOOLS_DIR}/bin:${PATH}"
> +          CT_DoStep INFO "Extracting, patching and installing companion tools"
> +          do_autoconf_extract
> +          do_autoconf
> +          CT_EndStep
> +        fi

Move all of this into do_companion_tools_extract() and do_companion_tools(), 
again, like do_debug_extract() and do_debug(). Look at scripts/build/debug.sh
for how it's done in there.

Globally, that's pretty good! Keep up the good work! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
`------------------------------^-------^------------------^--------------------'



--
For unsubscribe information see http://sourceware.org/lists.html#faq

[PATCH 1 of 1] companion_tools/autoconf: add autoconf tool

[Richard Strand]

# HG changeset patch
# User Richard Strand <richard.strand@icomera.com>
# Date 1263252709 0
# Node ID 965ba28f74a5c7995e10b5055aa30b1620fc7395
# Parent  2e2ead7d3a6e90bb2015dc87d8e0ca09137b1a44
companion_tools/autoconf: add autoconf tool

Initial version of adding autoconf as a companion tool.

Signed-off-by: Richard Strand <richard.strand@icomera.com>

diff -r 2e2ead7d3a6e -r 965ba28f74a5 config/companion_tools.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/companion_tools.in	Mon Jan 11 23:31:49 2010 +0000
@@ -0,0 +1,27 @@
+# Companion tools config options
+
+if EXPERIMENTAL
+
+menu "Companion tools"
+
+config COMP_TOOLS
+    bool
+    prompt "READ HELP before you say 'Y' here !!!"
+    help
+      Crosstool-NG relies on some external tools to be recent enough, namely:
+        autoconf >= 2.63
+      
+      If your system has older versions, we can build them for you,
+      but you are strongly encouraged to update your system instead!
+
+if COMP_TOOLS
+
+config COMP_TOOLS_autoconf
+    bool
+    prompt "autoconf"
+
+endif
+
+endmenu
+
+endif
diff -r 2e2ead7d3a6e -r 965ba28f74a5 config/config.in
--- a/config/config.in	Mon Jan 11 13:54:05 2010 +0000
+++ b/config/config.in	Mon Jan 11 23:31:49 2010 +0000
@@ -8,3 +8,4 @@
 source config/debug.in
 source config/tools.in
 source config/companion_libs.in
+source config/companion_tools.in
diff -r 2e2ead7d3a6e -r 965ba28f74a5 scripts/build/companion_tools.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/build/companion_tools.sh	Mon Jan 11 23:31:49 2010 +0000
@@ -0,0 +1,38 @@
+# Wrapper to build the companion tools facilities
+
+# List all companion tools facilities, and parse their scripts
+CT_COMP_TOOLS_FACILITY_LIST=
+for f in "${CT_LIB_DIR}/scripts/build/companion_tools/"*.sh; do
+    _f="$(basename "${f}" .sh)"
+    _f="${_f#???-}"
+    __f="CT_COMP_TOOLS_${_f}"
+    if [ "${!__f}" = "y" ]; then
+        CT_DoLog DEBUG "Enabling companion tools '${_f}'"
+        . "${f}"
+        CT_COMP_TOOLS_FACILITY_LIST="${CT_COMP_TOOLS_FACILITY_LIST} ${_f}"
+    else
+        CT_DoLog DEBUG "Disabling companion tools '${_f}'"
+    fi
+done
+
+# Download the companion tools facilities
+do_companion_tools_get() {
+    for f in ${CT_COMP_TOOLS_FACILITY_LIST}; do
+        do_companion_tools_${f}_get
+    done
+}
+
+# Extract and patch the companion tools facilities
+do_companion_tools_extract() {
+    for f in ${CT_COMP_TOOLS_FACILITY_LIST}; do
+        do_companion_tools_${f}_extract
+    done
+}
+
+# Build the companion tools facilities
+do_companion_tools() {
+    for f in ${CT_COMP_TOOLS_FACILITY_LIST}; do
+        do_companion_tools_${f}_build
+    done
+}
+
diff -r 2e2ead7d3a6e -r 965ba28f74a5 scripts/build/companion_tools/200-autoconf.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/build/companion_tools/200-autoconf.sh	Mon Jan 11 23:31:49 2010 +0000
@@ -0,0 +1,32 @@
+# Build script for autoconf
+
+CT_AUTOCONF_VERSION=2.65
+
+do_companion_tools_autoconf_get() {
+    CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" \
+               {ftp,http}://ftp.gnu.org/gnu/autoconf
+}
+
+do_companion_tools_autoconf_extract() {
+    CT_Extract "autoconf-${CT_AUTOCONF_VERSION}"
+    CT_Patch "autoconf-${CT_AUTOCONF_VERSION}"
+}
+
+do_companion_tools_autoconf_build() {
+    CT_DoStep EXTRA "Installing autoconf"
+    mkdir -p "${CT_BUILD_DIR}/build-autoconf"
+    CT_Pushd "${CT_BUILD_DIR}/build-autoconf"
+    
+    # Ensure configure gets run using the CONFIG_SHELL as configure seems to
+    # have trouble when CONFIG_SHELL is set and /bin/sh isn't bash
+    # For reference see:
+    # http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHEL
+    
+    CT_DoExecLog ALL ${CONFIG_SHELL} \
+    "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
+        --prefix="${CT_WORK_DIR}/tools"
+    CT_DoExecLog ALL make
+    CT_DoExecLog ALL make install
+    CT_Popd
+    CT_EndStep
+}
diff -r 2e2ead7d3a6e -r 965ba28f74a5 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Mon Jan 11 13:54:05 2010 +0000
+++ b/scripts/crosstool-NG.sh.in	Mon Jan 11 23:31:49 2010 +0000
@@ -114,6 +114,7 @@
 # export any variable, nor re-parse the configuration and functions files.
 . "${CT_LIB_DIR}/scripts/build/internals.sh"
 . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh"
+. "${CT_LIB_DIR}/scripts/build/companion_tools.sh"
 . "${CT_LIB_DIR}/scripts/build/kernel/${CT_KERNEL}.sh"
 . "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh"
 . "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh"
@@ -493,6 +494,7 @@
         CT_DoLog INFO "Downloading forbidden by configuration, skipping downloads"
     else
         CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
+        do_companion_tools_get
         do_kernel_get
         do_gmp_get
         do_mpfr_get
@@ -512,6 +514,14 @@
             CT_DoForceRmdir "${CT_SRC_DIR}"
             CT_DoExecLog ALL mkdir -p "${CT_SRC_DIR}"
         fi
+
+        if [ "${CT_COMP_TOOLS}" = "y" ]; then
+          CT_DoStep INFO "Extracting, patching and installing companion tools"
+          do_companion_tools_extract
+          do_companion_tools
+          CT_EndStep
+        fi
+
         CT_DoStep INFO "Extracting and patching toolchain components"
         do_kernel_extract
         do_gmp_extract

--
For unsubscribe information see http://sourceware.org/lists.html#faq