Re: [Libreoffice] [PATCH v2] convert Mesa to gbuild and add to tail_build

On 09.09.2011 21:28, Peter Foley wrote:
> On Fri, 9 Sep 2011, Norbert Thiebaud wrote:
>
> > On Fri, Sep 9, 2011 at 11:20 AM, Peter Foley <pefoley2@verizon.net> wrote:
> > > >
> > >
> > > Without the ifeq and with SYSTEM_MESA_HEADERS=YES I got this error.
> > >
> > > /root/libreoffice/slideshow/Library_OGLTrans.mk:66: *** gb_LinkTarget_use_external: unknown 
> > > external: Mesa.  Stop.
> >
> > what happen if you change the RepositoryExternal.mk part to
> >
> > +ifeq ($(SYSTEM_MESA_HEADERS),YES)
> > +
> > +define gb_LinkTarget__use_Mesa
> > +endef
> > +
> > +else
> > +
> > +define gb_LinkTarget__use_Mesa
> > +$(eval $(call gb_LinkTarget_add_external_headers,$(1),Mesa_inc))
> > +
> > +endef
> > +
> > +endif
> > +
> >
> > Norbert
>
>
> I got the same error when SYSTEM_MESA_HEADERS=YES. But it worked when 
> SYSTEM_MESA_HEADERS=NO.

the problem is this:

define gb_LinkTarget_use_external
$(if $(value gb_LinkTarget__use_$(2)),\
  $(call gb_LinkTarget__use_$(2),$(1)),\
  $(error gb_LinkTarget_use_external: unknown external: $(2)))
endef

the "if" is just intended to check that there actually is a variable
defined, but what it actually checks is whether there is a variable
defined that has a non-empty value.

until this Mesa case nobody noticed  :)

can you try the following patch:

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 69683c5..d003455 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1069,9 +1069,9 @@ endef
 # this forwards to functions that must be defined in RepositoryExternal.mk.
 # $(eval $(call gb_LinkTarget_use_external,library,external))
 define gb_LinkTarget_use_external
-$(if $(value gb_LinkTarget__use_$(2)),\
-  $(call gb_LinkTarget__use_$(2),$(1)),\
-  $(error gb_LinkTarget_use_external: unknown external: $(2)))
+$(if $(filter undefined,$(origin gb_LinkTarget__use_$(2))),\
+  $(error gb_LinkTarget_use_external: unknown external: $(2)),\
+  $(call gb_LinkTarget__use_$(2),$(1)))
 endef
 
 # $(call gb_LinkTarget_use_externals,library,externals)