[PATCH] newlib: fix potential issue of sys headers install

[Corinna Vinschen]

Hi Alexey,

Please add a description of the problem to the commit message
and why your patch fixes it.  A reader should understand why the
patch is necessary.


Thanks,
Corinna

On Aug 16 07:42, Alexey Lapshin wrote:
> ---
>  newlib/Makefile.am | 4 ++--
>  newlib/Makefile.in | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/newlib/Makefile.am b/newlib/Makefile.am
> index 126cf24c1..e29607ccd 100644
> --- a/newlib/Makefile.am
> +++ b/newlib/Makefile.am
> @@ -240,7 +240,7 @@ stmp-targ-include: config.status
>  	$(AM_V_at)s=machine/$(machine_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)s=sys/$(sys_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	  f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	  f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	  $(MKDIR_P) targ-include/`dirname $$f`; \
>  	  cp $$i targ-include/$$f; \
>  	done
> @@ -334,7 +334,7 @@ install-data-local: install-toollibLIBRARIES install-multi $(INSTALL_DATA_LOCAL)
>  	    else true; fi ; \
>  	  done ; \
>  	  for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	    f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	    f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	    $(MKDIR_P) $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	    $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	  done ; \
> diff --git a/newlib/Makefile.in b/newlib/Makefile.in
> index 93a97b5fb..e2e4ed752 100644
> --- a/newlib/Makefile.in
> +++ b/newlib/Makefile.in
> @@ -49975,7 +49975,7 @@ stmp-targ-include: config.status
>  	$(AM_V_at)s=machine/$(machine_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)s=sys/$(sys_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	  f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	  f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	  $(MKDIR_P) targ-include/`dirname $$f`; \
>  	  cp $$i targ-include/$$f; \
>  	done
> @@ -50064,7 +50064,7 @@ install-data-local: install-toollibLIBRARIES install-multi $(INSTALL_DATA_LOCAL)
>  	    else true; fi ; \
>  	  done ; \
>  	  for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	    f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	    f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	    $(MKDIR_P) $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	    $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	  done ; \
> -- 
> 2.34.1
> 

> From bfd83677213e2ee6910bd1026f521eb9a0773df0 Mon Sep 17 00:00:00 2001
> From: Alexey Lapshin <alexey.lapshin@espressif.com>
> Date: Wed, 16 Aug 2023 11:36:50 +0400
> Subject: [PATCH 1/3] newlib: fix potential issue of sys headers install
> 
> ---
>  newlib/Makefile.am | 4 ++--
>  newlib/Makefile.in | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/newlib/Makefile.am b/newlib/Makefile.am
> index 126cf24c1..e29607ccd 100644
> --- a/newlib/Makefile.am
> +++ b/newlib/Makefile.am
> @@ -240,7 +240,7 @@ stmp-targ-include: config.status
>  	$(AM_V_at)s=machine/$(machine_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)s=sys/$(sys_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	  f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	  f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	  $(MKDIR_P) targ-include/`dirname $$f`; \
>  	  cp $$i targ-include/$$f; \
>  	done
> @@ -334,7 +334,7 @@ install-data-local: install-toollibLIBRARIES install-multi $(INSTALL_DATA_LOCAL)
>  	    else true; fi ; \
>  	  done ; \
>  	  for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	    f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	    f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	    $(MKDIR_P) $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	    $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	  done ; \
> diff --git a/newlib/Makefile.in b/newlib/Makefile.in
> index 93a97b5fb..e2e4ed752 100644
> --- a/newlib/Makefile.in
> +++ b/newlib/Makefile.in
> @@ -49975,7 +49975,7 @@ stmp-targ-include: config.status
>  	$(AM_V_at)s=machine/$(machine_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)s=sys/$(sys_dir)/include d= $(TARG_INCLUDE_CP_DIR)
>  	$(AM_V_at)for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	  f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	  f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	  $(MKDIR_P) targ-include/`dirname $$f`; \
>  	  cp $$i targ-include/$$f; \
>  	done
> @@ -50064,7 +50064,7 @@ install-data-local: install-toollibLIBRARIES install-multi $(INSTALL_DATA_LOCAL)
>  	    else true; fi ; \
>  	  done ; \
>  	  for i in $(call rwildcard,$(srcdir)/libc/sys/$(sys_dir)/include/,*.h); do \
> -	    f=`echo $$i | sed s:$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
> +	    f=`echo $$i | sed s:^$(srcdir)/libc/sys/$(sys_dir)/include/::`; \
>  	    $(MKDIR_P) $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	    $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/`dirname $$f`; \
>  	  done ; \
> -- 
> 2.34.1
>