tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

LIBTOOL_OVERRIDE and ltmain.sh/libtool.m4 and gtexinfo



With a hint from joerg@ I was able to track down the libtool issue with gtexinfo abit,
but am curious about the correct way to fix the "phasing" of things.

First, with the following patch to gtexinfo, at least 'libtool' gets replaced in the XSParagraph
directory:
> diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
> index a615da7..4fd5fef 100644
> --- a/devel/gtexinfo/Makefile
> +++ b/devel/gtexinfo/Makefile
> @@ -2,6 +2,7 @@
>  
>  DISTNAME=              texinfo-6.1
>  PKGNAME=               g${DISTNAME}
> +PKGREVISION=           1
>  CATEGORIES=            devel sysutils
>  MASTER_SITES=          ${MASTER_SITE_GNU:=texinfo/}
>  
> @@ -20,6 +21,9 @@ GNU_CONFIGURE=                yes
>  CONFIGURE_ARGS+=       --with-external-libintl-perl
>  CONFIGURE_ARGS+=       --with-external-Text-Unidecode
>  CONFIGURE_ARGS+=       --with-external-Unicode-EastAsianWidth
> +USE_LIBTOOL=           yes
> +OVERRIDE_DIRDEPTH=     5
> +#LIBTOOL_OVERRIDE=     tp/Texinfo/Convert/XSParagraph/libtool
>  
>  INFO_FILES=            yes
>  TEST_TARGET=           check
> @@ -34,6 +38,7 @@ REPLACE_SH+=          util/texi2dvi
>  .include "../../mk/bsd.prefs.mk"
>  .include "options.mk"
>  
> +.include "../../lang/perl5/buildlink3.mk"       # for EXTERN.h in XSParagraph
>  .include "../../mk/termcap.buildlink3.mk"
>  .include "../../mk/bsd.pkg.mk"
>  

and with the following patch to libtool:
> diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
> index 0cb3d01..d3ae443 100644
> --- a/devel/libtool/patches/patch-ac
> +++ b/devel/libtool/patches/patch-ac
> @@ -156,3 +156,12 @@ add back upstream patches:
>             $ECHO >> $output "\
>   relink_command=\"$relink_command\""
>           fi
> +@@ -9428,7 +9461,7 @@ relink_command=\"$relink_command\""
> + 
> +       # Do a symbolic link so that the libtool archive can be found in
> +       # LD_LIBRARY_PATH before the program is installed.
> +-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
> ++      func_show_eval '( cd "$output_objdir" && $RM -f "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
> +       ;;
> +     esac
> +     exit $EXIT_SUCCESS

I can get things to manually run.

But, there is an ltmain.sh found there (not to mention as well as in build-aux) and a libtool.m4
located in the m4 subdirectory so what happens is that libtool is generated as well as *used* during
configure, meaning the bundled libtool 2.4.6 is still used as LIBTOOL_OVERRIDE seems to be used only 'post-configure'.

There doesn't seem to be any standard means to update ltmain.sh and libtool.m4 'pre-configure'.

I noticed in audio/xsidplay/Makefile: 
> pre-configure:
> 	rm ${WRKSRC}/scripts/ltmain.sh && ${LN} -s ${PREFIX}/share/libtool/ltmain.sh ${WRKSRC}/scripts/ltmain.sh

which doesn't seem to even work since ltmain.sh is delivered to $PREFIX/share/libtool/config/ltmain.sh !

Is this nevertheless the only useable approach (but using the correct directories), that is manually replacing ltmain.sh and libtool.m4
when libtool itself is used during the configure phase?

-- 
Richard PALO




Home | Main Index | Thread Index | Old Index