On Sun, Jun 24, 2012 at 05:27:18PM +0200, Matthieu Herrb wrote:
> Hi,
>
> Automake 1.10 used to call various shell scripts (mostly the infamous
> install-sh one) without an explicit /bin/sh in front of them, which
> caused Xenocara builds to fail, since no shell script in /usr/xenocara
> is supposed to have the 'x' bit set (since OpenBSD doesn't want files
> with the 'x' bit set in the CVS repository for various reasons).
>
> This has been fixed somewhere in the automake 1.11 release, so now if
> I regenerate autotools-produced files in Xenocara with automake 1.11,
> I see failures like
>
> /bin/sh /bin/sh /usr/xenocara/lib/fontconfig/install -d /etc/fonts
> /var/cache/fontconfig
> /bin/sh[1]: syntax error: `(' unexpected
>
> No ${install_sh} is defined as ${SHELL} /path/to/install-sh
>
> So remove the now useless patches. ok ?
These patches also need to be removed for automake 1.10 and 1.12.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/devel/automake/1.11/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 Makefile
> --- Makefile 23 Apr 2012 08:01:14 -0000 1.8
> +++ Makefile 24 Jun 2012 14:09:42 -0000
> @@ -5,6 +5,7 @@ COMMENT= GNU standards-compliant Makefil
> VERSION= 1.11
> DISTNAME= automake-${VERSION}.5
> PKGSPEC= automake->=${VERSION},<1.12
> +REVISION= 0
>
> CATEGORIES= devel
> MASTER_SITES= ${MASTER_SITE_GNU:=automake/}
> Index: patches/patch-automake_in
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/devel/automake/1.11/patches/patch-automake_in,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-automake_in
> --- patches/patch-automake_in 22 Feb 2012 07:14:20 -0000 1.2
> +++ patches/patch-automake_in 24 Jun 2012 14:08:33 -0000
> @@ -1,15 +1,6 @@
> $OpenBSD: patch-automake_in,v 1.2 2012/02/22 07:14:20 ajacoutot Exp $
> --- automake.in.orig Wed Feb 1 05:31:13 2012
> +++ automake.in Thu Feb 16 22:24:10 2012
> -@@ -4384,7 +4384,7 @@ sub handle_configure ($$$@)
> - # Use $(install_sh), not $(MKDIR_P) because the latter requires
> - # at least one argument, and $(mkinstalldirs) used to work
> - # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
> -- define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
> -+ define_variable ('mkinstalldirs', '$(SHELL) $(install_sh) -d',
> INTERNAL);
> - }
> -
> - reject_var ('CONFIG_HEADER',
> @@ -5337,6 +5337,7 @@ sub scan_autoconf_traces ($)
> _LT_AC_TAGCONFIG => 0,
> m4_include => 1,
> Index: patches/patch-lib_am_header-vars_am
> ===================================================================
> RCS file: patches/patch-lib_am_header-vars_am
> diff -N patches/patch-lib_am_header-vars_am
> --- patches/patch-lib_am_header-vars_am 8 Apr 2012 07:12:56 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-lib_am_header-vars_am,v 1.2 2012/04/08 07:12:56 ajacoutot
> Exp $
> ---- lib/am/header-vars.am.orig Mon Apr 2 06:09:39 2012
> -+++ lib/am/header-vars.am Sat Apr 7 22:15:00 2012
> -@@ -63,9 +63,9 @@ pkglibdir = $(libdir)/@PACKAGE@
> - pkglibexecdir = $(libexecdir)/@PACKAGE@
> -
> - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
> --install_sh_DATA = $(install_sh) -c -m 644
> --install_sh_PROGRAM = $(install_sh) -c
> --install_sh_SCRIPT = $(install_sh) -c
> -+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
> -+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
> -+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
> - INSTALL_HEADER = $(INSTALL_DATA)
> - transform = $(program_transform_name)
> -
>
>
> --
> Matthieu Herrb
>
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
