[git commit master 1/1] buildsys: prefer the form HEADERS_RM-$(<config>)
Carmelo AMOROSO
carmelo.amoroso at st.com
Tue Mar 8 09:22:54 UTC 2011
On 3/8/2011 9:53 AM, Peter Kjellerstedt wrote:
> > -----Original Message-----
> > From: uclibc-cvs-bounces at uclibc.org [mailto:uclibc-cvs-
> > bounces at uclibc.org] On Behalf Of Carmelo Amoroso
> > Sent: 07 March 2011 18:31
> > To: uclibc-cvs at uclibc.org
> > Subject: [git commit master 1/1] buildsys: prefer the form HEADERS_RM-$(<config>)
> >
> > commit:
> http://git.uclibc.org/uClibc/commit/?id=07044019e6260991729926645e7d221f38376f9d
> > branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
> >
> > Fix removal of sgtty.h using HEADERS_RM-$(<config>) syntax.
> > Sort it alphabetically.
> >
> > Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
> > ---
> > Makefile.in | 4 +---
> > 1 files changed, 1 insertions(+), 3 deletions(-)
> >
> > diff --git a/Makefile.in b/Makefile.in
> > index 995347b..dd88efc 100644
> > --- a/Makefile.in
> > +++ b/Makefile.in
> > @@ -222,9 +222,6 @@ HEADERS_RM- := \
> > rpc/des_crypt.h \
> > rpc/key_prot.h \
> > rpc/rpc_des.h
> > -ifeq ($(UCLIBC_STRICT_HEADERS),y)
> > -HEADERS_RM- += sgtty.h
> > -endif
> > HEADERS_RM-$(HAVE_SHARED) += dlfcn.h bits/dlfcn.h
> > HEADERS_RM-$(PTHREADS_DEBUG_SUPPORT) += thread_db.h
> > HEADERS_RM-$(UCLIBC_HAS_BSD_ERR) += err.h
> > @@ -275,6 +272,7 @@ HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) +=
> > sys/fsuid.h sys/inotify.h sys/pe
> > sys/sysctl.h \
> > sys/sysinfo.h \
> > sys/vfs.h
> > +HEADERS_RM-$(UCLIBC_STRICT_HEADERS) += sgtty.h
>
> This is _not_ the same as the removed ifeq-statement. The ifeq-statement
> above sets $(HEADERS_RM-) if $(UCLIBC_STRICT_HEADERS) is y, whereas the
> line above sets $(HEADERS_RM-) if $(UCLIBC_STRICT_HEADERS) is unset...
>
> This is untested, but should work:
>
> HEADERS_RM-$(if $(UCLIBC_STRICT_HEADERS),,y) += sgtty.h
>
> > HEADERS_RM-$(UCLIBC_SUPPORT_AI_ADDRCONFIG) += ifaddrs.h
> > HEADERS_RM-$(UCLIBC_SV4_DEPRECATED) += ustat.h sys/ustat.h bits/ustat.h
> > HEADERS_RM-$(UCLIBC_SUSV3_LEGACY) += sys/timeb.h regexp.h
>
> //Peter
>
Hi Peter,
the original post from Peter M. was:
HEADERS_RM-$(findstring y,$(UCLIBC_STRICT_HEADERS)) += sgtty.h
to which Bernard replied saying "The findstring is useless", so I fixed
it as below:
HEADERS_RM-$(UCLIBC_STRICT_HEADERS) += sgtty.h.
that should mean, IIUC,
"do not install sgtty.h if STRICT_HEADERS is not set"
So if you say, and likely you are right, that this is not the same as
the ifeq statement, I guess that also the original Peter change is not
correct... am I wrong ?
Carmelo
> _______________________________________________
> uClibc mailing list
> uClibc at uclibc.org
> http://lists.busybox.net/mailman/listinfo/uclibc
>
More information about the uClibc
mailing list