[PATCH BlueZ] build: use abspath for lib/bluetooth

[PATCH BlueZ] build: use abspath for lib/bluetooth

[Yunhan Wang]

When building from out of tree, and the top build dir was specified as
an absolute path, the linked headers in ${builddir}/lib/bluetooth were
broken.  This patch fixes it by relying on make's abspath macro as
opposed to the path concatenation.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index eaed632e8..ad638cbb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -499,7 +499,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)
 
 lib/bluetooth/%.h: lib/%.h
 	$(AM_V_at)$(MKDIR_P) lib/bluetooth
-	$(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
+	$(AM_V_GEN)$(LN_S) -f $(abspath $<) $@
 
 if COVERAGE
 clean-coverage:
-- 
2.14.1.342.g6490525c54-goog

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Yunhan Wang]

Anyone can help to take a review?

Thanks
Best wishes
Yunhan

On Wed, Aug 23, 2017 at 3:58 PM, Yunhan Wang <yunhanw@google.com> wrote:
> When building from out of tree, and the top build dir was specified as
> an absolute path, the linked headers in ${builddir}/lib/bluetooth were
> broken.  This patch fixes it by relying on make's abspath macro as
> opposed to the path concatenation.
> ---
>  Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index eaed632e8..ad638cbb2 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -499,7 +499,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)
>
>  lib/bluetooth/%.h: lib/%.h
>         $(AM_V_at)$(MKDIR_P) lib/bluetooth
> -       $(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
> +       $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@
>
>  if COVERAGE
>  clean-coverage:
> --
> 2.14.1.342.g6490525c54-goog
>

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Marcel Holtmann]

Hi Yunhan,

> When building from out of tree, and the top build dir was specified as
> an absolute path, the linked headers in ${builddir}/lib/bluetooth were
> broken.  This patch fixes it by relying on make's abspath macro as
> opposed to the path concatenation.
> ---
> Makefile.am | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index eaed632e8..ad638cbb2 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -499,7 +499,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)
> 
> lib/bluetooth/%.h: lib/%.h
> 	$(AM_V_at)$(MKDIR_P) lib/bluetooth
> -	$(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
> +	$(AM_V_GEN)$(LN_S) -f $(abspath $<) $@

does “fakeroot make distcheck” still works when doing this change?

Regards

Marcel

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Yunhan Wang]

Hi, Marcel

I just run make distcheck, it is working with this change upon latest maste=
r.

Could you help to apply it?

The below are detailed step.
1. ./configure --prefix=3D/usr --mandir=3D/usr/share/man --sysconfdir=3D/et=
c
--localstatedir=3D/var --enable-experimental
--with-systemdsystemunitdir=3D/lib/systemd/system
--with-systemduserunitdir=3D/usr/lib/systemd --enable-deprecated
--enable-tools --enable-testing --enable-experimental
2. make distcheck

Thanks
Best wishes
Yunhan

On Mon, Aug 28, 2017 at 10:08 PM, Marcel Holtmann <marcel@holtmann.org> wro=
te:
> Hi Yunhan,
>
>> When building from out of tree, and the top build dir was specified as
>> an absolute path, the linked headers in ${builddir}/lib/bluetooth were
>> broken.  This patch fixes it by relying on make's abspath macro as
>> opposed to the path concatenation.
>> ---
>> Makefile.am | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index eaed632e8..ad638cbb2 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -499,7 +499,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)
>>
>> lib/bluetooth/%.h: lib/%.h
>>       $(AM_V_at)$(MKDIR_P) lib/bluetooth
>> -     $(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
>> +     $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@
>
> does =E2=80=9Cfakeroot make distcheck=E2=80=9D still works when doing thi=
s change?
>
> Regards
>
> Marcel
>

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Yunhan Wang]

Hi, Marcel

Any other concern on this patch?

Thanks
Best wishes
Yunhan

On Mon, Sep 18, 2017 at 9:47 PM, Yunhan Wang <yunhanw@google.com> wrote:
> Hi, Marcel
>
> I just run make distcheck, it is working with this change upon latest mas=
ter.
>
> Could you help to apply it?
>
> The below are detailed step.
> 1. ./configure --prefix=3D/usr --mandir=3D/usr/share/man --sysconfdir=3D/=
etc
> --localstatedir=3D/var --enable-experimental
> --with-systemdsystemunitdir=3D/lib/systemd/system
> --with-systemduserunitdir=3D/usr/lib/systemd --enable-deprecated
> --enable-tools --enable-testing --enable-experimental
> 2. make distcheck
>
> Thanks
> Best wishes
> Yunhan
>
> On Mon, Aug 28, 2017 at 10:08 PM, Marcel Holtmann <marcel@holtmann.org> w=
rote:
>> Hi Yunhan,
>>
>>> When building from out of tree, and the top build dir was specified as
>>> an absolute path, the linked headers in ${builddir}/lib/bluetooth were
>>> broken.  This patch fixes it by relying on make's abspath macro as
>>> opposed to the path concatenation.
>>> ---
>>> Makefile.am | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Makefile.am b/Makefile.am
>>> index eaed632e8..ad638cbb2 100644
>>> --- a/Makefile.am
>>> +++ b/Makefile.am
>>> @@ -499,7 +499,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)
>>>
>>> lib/bluetooth/%.h: lib/%.h
>>>       $(AM_V_at)$(MKDIR_P) lib/bluetooth
>>> -     $(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
>>> +     $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@
>>
>> does =E2=80=9Cfakeroot make distcheck=E2=80=9D still works when doing th=
is change?
>>
>> Regards
>>
>> Marcel
>>

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Yunhan Wang]

Hi, Marcel

Ping for any other concern?

Thanks
Best wishes
Yunhan

On Tue, Sep 19, 2017 at 10:55 PM, Yunhan Wang <yunhanw@google.com> wrote:
> Hi, Marcel
>
> Any other concern on this patch?
>
> Thanks
> Best wishes
> Yunhan
>
> On Mon, Sep 18, 2017 at 9:47 PM, Yunhan Wang <yunhanw@google.com> wrote:
>> Hi, Marcel
>>
>> I just run make distcheck, it is working with this change upon latest ma=
ster.
>>
>> Could you help to apply it?
>>
>> The below are detailed step.
>> 1. ./configure --prefix=3D/usr --mandir=3D/usr/share/man --sysconfdir=3D=
/etc
>> --localstatedir=3D/var --enable-experimental
>> --with-systemdsystemunitdir=3D/lib/systemd/system
>> --with-systemduserunitdir=3D/usr/lib/systemd --enable-deprecated
>> --enable-tools --enable-testing --enable-experimental
>> 2. make distcheck
>>
>> Thanks
>> Best wishes
>> Yunhan
>>
>> On Mon, Aug 28, 2017 at 10:08 PM, Marcel Holtmann <marcel@holtmann.org> =
wrote:
>>> Hi Yunhan,
>>>
>>>> When building from out of tree, and the top build dir was specified as
>>>> an absolute path, the linked headers in ${builddir}/lib/bluetooth were
>>>> broken.  This patch fixes it by relying on make's abspath macro as
>>>> opposed to the path concatenation.
>>>> ---
>>>> Makefile.am | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/Makefile.am b/Makefile.am
>>>> index eaed632e8..ad638cbb2 100644
>>>> --- a/Makefile.am
>>>> +++ b/Makefile.am
>>>> @@ -499,7 +499,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)
>>>>
>>>> lib/bluetooth/%.h: lib/%.h
>>>>       $(AM_V_at)$(MKDIR_P) lib/bluetooth
>>>> -     $(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
>>>> +     $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@
>>>
>>> does =E2=80=9Cfakeroot make distcheck=E2=80=9D still works when doing t=
his change?
>>>
>>> Regards
>>>
>>> Marcel
>>>

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Yunhan Wang]

Hi

Can anyone take a further review?

Thanks
Best wishes
Yunhan

On Thu, Sep 21, 2017 at 11:11 AM, Yunhan Wang <yunhanw@google.com> wrote:
> Hi, Marcel
>
> Ping for any other concern?
>
> Thanks
> Best wishes
> Yunhan
>
> On Tue, Sep 19, 2017 at 10:55 PM, Yunhan Wang <yunhanw@google.com> wrote:
>> Hi, Marcel
>>
>> Any other concern on this patch?
>>
>> Thanks
>> Best wishes
>> Yunhan
>>
>> On Mon, Sep 18, 2017 at 9:47 PM, Yunhan Wang <yunhanw@google.com> wrote:
>>> Hi, Marcel
>>>
>>> I just run make distcheck, it is working with this change upon latest m=
aster.
>>>
>>> Could you help to apply it?
>>>
>>> The below are detailed step.
>>> 1. ./configure --prefix=3D/usr --mandir=3D/usr/share/man --sysconfdir=
=3D/etc
>>> --localstatedir=3D/var --enable-experimental
>>> --with-systemdsystemunitdir=3D/lib/systemd/system
>>> --with-systemduserunitdir=3D/usr/lib/systemd --enable-deprecated
>>> --enable-tools --enable-testing --enable-experimental
>>> 2. make distcheck
>>>
>>> Thanks
>>> Best wishes
>>> Yunhan
>>>
>>> On Mon, Aug 28, 2017 at 10:08 PM, Marcel Holtmann <marcel@holtmann.org>=
 wrote:
>>>> Hi Yunhan,
>>>>
>>>>> When building from out of tree, and the top build dir was specified a=
s
>>>>> an absolute path, the linked headers in ${builddir}/lib/bluetooth wer=
e
>>>>> broken.  This patch fixes it by relying on make's abspath macro as
>>>>> opposed to the path concatenation.
>>>>> ---
>>>>> Makefile.am | 2 +-
>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/Makefile.am b/Makefile.am
>>>>> index eaed632e8..ad638cbb2 100644
>>>>> --- a/Makefile.am
>>>>> +++ b/Makefile.am
>>>>> @@ -499,7 +499,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)
>>>>>
>>>>> lib/bluetooth/%.h: lib/%.h
>>>>>       $(AM_V_at)$(MKDIR_P) lib/bluetooth
>>>>> -     $(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
>>>>> +     $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@
>>>>
>>>> does =E2=80=9Cfakeroot make distcheck=E2=80=9D still works when doing =
this change?
>>>>
>>>> Regards
>>>>
>>>> Marcel
>>>>

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Johan Hedberg]

Hi Yunhan,

On Sun, Sep 24, 2017, Yunhan Wang wrote:
> Can anyone take a further review?

I think Marcel is still waiting for confirmation that this works with
fakeroot (at least I didn't see that you would have confirmed it). I
tried that myself just now and seems to work fine, so no objections from
me for merging.

Johan

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Luiz Augusto von Dentz]

Hi Yunhan,

On Mon, Sep 25, 2017 at 3:15 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> Hi Yunhan,
>
> On Sun, Sep 24, 2017, Yunhan Wang wrote:
>> Can anyone take a further review?
>
> I think Marcel is still waiting for confirmation that this works with
> fakeroot (at least I didn't see that you would have confirmed it). I
> tried that myself just now and seems to work fine, so no objections from
> me for merging.
>
> Johan

Applied, thanks.

-- 
Luiz Augusto von Dentz

Re: [PATCH BlueZ] build: use abspath for lib/bluetooth

[Yunhan Wang]

Thank you. All

Best wishes
Yunhan

On Mon, Sep 25, 2017 at 6:22 AM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> Hi Yunhan,
>
> On Mon, Sep 25, 2017 at 3:15 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
>> Hi Yunhan,
>>
>> On Sun, Sep 24, 2017, Yunhan Wang wrote:
>>> Can anyone take a further review?
>>
>> I think Marcel is still waiting for confirmation that this works with
>> fakeroot (at least I didn't see that you would have confirmed it). I
>> tried that myself just now and seems to work fine, so no objections from
>> me for merging.
>>
>> Johan
>
> Applied, thanks.
>
> --
> Luiz Augusto von Dentz