diff mbox

comptools/make: Install 'gmake' symlink

Message ID 1412844338-5771-1-git-send-email-bernhard@bwalle.de
State Rejected, archived
Headers show

Commit Message

Bernhard Walle Oct. 9, 2014, 8:45 a.m. UTC
We had following problem: We're building a toolchain with an old glibc
version for compatibility with old Linux distributions (glibc 2.9). This
version requires make < 4 to build. However, the configure script of
glibc looks for make in the order "gnumake", "gmake" and "make". So when
"gmake" is available in the system (which is the case on Gentoo Linux
per default, unfortunately), then configure finds the system gmake 4.1
instead of the ct-ng make 3.82.

This patch installs a symlink so that 'gmake' is also available in the
old version when building toolchains.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 scripts/build/companion_tools/050-make.sh | 1 +
 1 file changed, 1 insertion(+)

Comments

Bernhard Walle Dec. 5, 2014, 7 a.m. UTC | #1
Please review me

--
For unsubscribe information see http://sourceware.org/lists.html#faq
Bryan Hundven Dec. 5, 2014, 7:15 a.m. UTC | #2
Bernhard,

On Thu, Oct 9, 2014 at 1:45 AM, Bernhard Walle <bernhard@bwalle.de> wrote:
> We had following problem: We're building a toolchain with an old glibc
> version for compatibility with old Linux distributions (glibc 2.9). This
> version requires make < 4 to build. However, the configure script of
> glibc looks for make in the order "gnumake", "gmake" and "make". So when
> "gmake" is available in the system (which is the case on Gentoo Linux
> per default, unfortunately), then configure finds the system gmake 4.1
> instead of the ct-ng make 3.82.
>
> This patch installs a symlink so that 'gmake' is also available in the
> old version when building toolchains.

What do you think of adding a:

    config COMP_TOOLS_make_gmake
        bool
        prompt "Add gmake symlink to companion gnu/make"
        depends on COMP_TOOLS_make

Just after COMP_TOOLS_make in config/companion_tools.in that enables
the creation of this symlink.

Then add...

> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  scripts/build/companion_tools/050-make.sh | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
> index 6524e35..b7a8727 100644
> --- a/scripts/build/companion_tools/050-make.sh
> +++ b/scripts/build/companion_tools/050-make.sh
> @@ -22,6 +22,7 @@ do_companion_tools_make_build() {
>                       --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
>      CT_DoExecLog ALL make
>      CT_DoExecLog ALL make install
if [ "$COMP_TOOLS_make_gmake" = "y" ]; then
> +    CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake"
fi
>      CT_Popd
>      CT_EndStep
>  }
> --
> 2.1.2

as it may be handy to sometimes install the gmake symlink, but it may
not be adventitious in other scenarios.

-Bryan

--
For unsubscribe information see http://sourceware.org/lists.html#faq
Bryan Hundven Dec. 5, 2014, 7:17 a.m. UTC | #3
Bernhard,

On Thu, Dec 4, 2014 at 11:15 PM, Bryan Hundven <bryanhundven@gmail.com> wrote:
> Bernhard,
>
> On Thu, Oct 9, 2014 at 1:45 AM, Bernhard Walle <bernhard@bwalle.de> wrote:
>> We had following problem: We're building a toolchain with an old glibc
>> version for compatibility with old Linux distributions (glibc 2.9). This
>> version requires make < 4 to build. However, the configure script of
>> glibc looks for make in the order "gnumake", "gmake" and "make". So when
>> "gmake" is available in the system (which is the case on Gentoo Linux
>> per default, unfortunately), then configure finds the system gmake 4.1
>> instead of the ct-ng make 3.82.
>>
>> This patch installs a symlink so that 'gmake' is also available in the
>> old version when building toolchains.
>
> What do you think of adding a:
>
>     config COMP_TOOLS_make_gmake
>         bool
>         prompt "Add gmake symlink to companion gnu/make"
>         depends on COMP_TOOLS_make
>
> Just after COMP_TOOLS_make in config/companion_tools.in that enables
> the creation of this symlink.
>
> Then add...
>
>> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
>> ---
>>  scripts/build/companion_tools/050-make.sh | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
>> index 6524e35..b7a8727 100644
>> --- a/scripts/build/companion_tools/050-make.sh
>> +++ b/scripts/build/companion_tools/050-make.sh
>> @@ -22,6 +22,7 @@ do_companion_tools_make_build() {
>>                       --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
>>      CT_DoExecLog ALL make
>>      CT_DoExecLog ALL make install
> if [ "$COMP_TOOLS_make_gmake" = "y" ]; then

Doh, at this point it would be: CT_COMP_TOOLS_make_gmake

>> +    CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake"
> fi
>>      CT_Popd
>>      CT_EndStep
>>  }
>> --
>> 2.1.2
>
> as it may be handy to sometimes install the gmake symlink, but it may
> not be adventitious in other scenarios.
>
> -Bryan

-Bryan

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

Patch

diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
index 6524e35..b7a8727 100644
--- a/scripts/build/companion_tools/050-make.sh
+++ b/scripts/build/companion_tools/050-make.sh
@@ -22,6 +22,7 @@  do_companion_tools_make_build() {
                      --prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
     CT_DoExecLog ALL make
     CT_DoExecLog ALL make install
+    CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake"
     CT_Popd
     CT_EndStep
 }