Re: ct-ng fails building mpfr

["Yann E. MORIN" <yann dot morin dot 1998 at anciens dot enib dot fr>]

Hello Zoltan!
Hello All!

On Monday 17 November 2008 21:39:40 Zoltan Devai wrote:
> >> So, ExtractAndPatch extracts mpfr with its original config.sub/guess and then
> >> overrides them with the ct-ng version depending on the config.
> >> Independent of that, libtoolize -f will delete the both files.
> Maybe I wasn't clear enough: 'libtoolize -f' removes config.{sub,guess},
> and does not install any other version.
[--SNIP--]
> This seems to be the culprit: The 2.2.4 version doesn't install the new
> files without -i / --install.
> See: https://answers.launchpad.net/ubuntu/+source/libtool/+question/46987

Does the attached fix it for you? If so, I'll commit tonight.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +0/33 662376056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| --==< ^_^ >==-- `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
`------------------------------^-------^------------------^--------------------'

Index: ct-ng.trunk/scripts/build/mpfr.sh
===================================================================
--- ct-ng.trunk/scripts/build/mpfr.sh	(revision 1225)
+++ ct-ng.trunk/scripts/build/mpfr.sh	(working copy)
@@ -37,7 +37,17 @@
     if [ ! -f .autotools.ct-ng ]; then
         CT_DoLog DEBUG "Re-building autotools files"
         CT_DoExecLog ALL autoreconf -fi
-        CT_DoExecLog ALL libtoolize -f
+        # Starting with libtool-1.9f, config.{guess,sub} are no longer
+        # installed without -i, but starting with libtool-2.2.6, they
+        # are no longer removed without -i. Sight... Just use -i with
+        # libtool >=2
+        libtoolize_opt=
+        case "$(libtoolize --version |head -n 1 |gawk '{ print $(NF); }')" in
+            0.*)    ;;
+            1.*)    ;;
+            *)      libtoolize_opt=-i;;
+        esac
+        CT_DoExecLog ALL libtoolize -f ${libtoolize_opt}
         touch .autotools.ct-ng
     fi
     CT_Popd

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