diff mbox

[RFC] Revert "platform: Makefile.inc: use `` instead of != for compatibility with older versions of Make"

Message ID 1444921824-16599-1-git-send-email-ivan.khoronzhuk@linaro.org
State New
Headers show

Commit Message

Ivan Khoronzhuk Oct. 15, 2015, 3:10 p.m. UTC 
This reverts commit a9cc0fc700a4a8b9589404a18136b01974ca4aa3.

This revert helps me to revert messages like:
"fatal: No names found, cannot describe anything." in case if I build
ODP outside of source catalog by:

../../odp/configure --enable-test-perf --enable-test-vald
make

Seems it's connected with nesting `...`.

Is someone going to fix it?

---

 platform/Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ivan Khoronzhuk Oct. 15, 2015, 3:15 p.m. UTC | #1 
It shouldn't depend on catalog the project is built.

On 15.10.15 18:10, Ivan Khoronzhuk wrote:
> This reverts commit a9cc0fc700a4a8b9589404a18136b01974ca4aa3.
>
> This revert helps me to revert messages like:
> "fatal: No names found, cannot describe anything." in case if I build
> ODP outside of source catalog by:
>
> ../../odp/configure --enable-test-perf --enable-test-vald
> make
>
> Seems it's connected with nesting `...`.
>
> Is someone going to fix it?
>
> ---
>
>   platform/Makefile.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/platform/Makefile.inc b/platform/Makefile.inc
> index f64e37c..f232daa 100644
> --- a/platform/Makefile.inc
> +++ b/platform/Makefile.inc
> @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la
>
>   AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
>
> -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh`
> +GIT_DESC !=$(top_srcdir)/scripts/git_hash.sh
>   AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
>   AM_CFLAGS += -DPLATFORM=${with_platform}
>
Nicolas Morey-Chaisemartin Oct. 15, 2015, 3:20 p.m. UTC | #2 
Maybe changing the directory before running git_hash.sh would fix your issue and keep the old make working ?

Something like

This was fixed some time ago:

commit 06537738ea438c3e339fc269dedb4ed6c5e48f07
Author: Anders Roxell <anders.roxell@linaro.org>
Date:   Fri Aug 14 15:25:05 2015 +0200

    scripts/git_hash: fix build from tar source
    
    Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
    Reviewed-and-tested-by: Mike Holmes <mike.holmes@linaro.org>
    Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

Call to git_hash now adds a path to top_srcdir and handles non git dir

On 10/15/2015 05:10 PM, Ivan Khoronzhuk wrote:
> This reverts commit a9cc0fc700a4a8b9589404a18136b01974ca4aa3.
>
> This revert helps me to revert messages like:
> "fatal: No names found, cannot describe anything." in case if I build
> ODP outside of source catalog by:
>
> ../../odp/configure --enable-test-perf --enable-test-vald
> make
>
> Seems it's connected with nesting `...`.
>
> Is someone going to fix it?
>
> ---
>
>  platform/Makefile.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/platform/Makefile.inc b/platform/Makefile.inc
> index f64e37c..f232daa 100644
> --- a/platform/Makefile.inc
> +++ b/platform/Makefile.inc
> @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la
>  
>  AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
>  
> -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh`
> +GIT_DESC !=$(top_srcdir)/scripts/git_hash.sh
>  AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
>  AM_CFLAGS += -DPLATFORM=${with_platform}
Nicolas Morey-Chaisemartin Oct. 15, 2015, 3:21 p.m. UTC | #3 
Please forget the first two sentences of my previous mail.
I started writing an alternate patch and then realized it was fixed in master already.

On 10/15/2015 05:20 PM, Nicolas Morey-Chaisemartin wrote:
> Maybe changing the directory before running git_hash.sh would fix your issue and keep the old make working ?
>
> Something like
>
> This was fixed some time ago:
>
> commit 06537738ea438c3e339fc269dedb4ed6c5e48f07
> Author: Anders Roxell <anders.roxell@linaro.org>
> Date:   Fri Aug 14 15:25:05 2015 +0200
>
>     scripts/git_hash: fix build from tar source
>     
>     Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
>     Reviewed-and-tested-by: Mike Holmes <mike.holmes@linaro.org>
>     Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>
> Call to git_hash now adds a path to top_srcdir and handles non git dir
>
> On 10/15/2015 05:10 PM, Ivan Khoronzhuk wrote:
>> This reverts commit a9cc0fc700a4a8b9589404a18136b01974ca4aa3.
>>
>> This revert helps me to revert messages like:
>> "fatal: No names found, cannot describe anything." in case if I build
>> ODP outside of source catalog by:
>>
>> ../../odp/configure --enable-test-perf --enable-test-vald
>> make
>>
>> Seems it's connected with nesting `...`.
>>
>> Is someone going to fix it?
>>
>> ---
>>
>>  platform/Makefile.inc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/platform/Makefile.inc b/platform/Makefile.inc
>> index f64e37c..f232daa 100644
>> --- a/platform/Makefile.inc
>> +++ b/platform/Makefile.inc
>> @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la
>>  
>>  AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
>>  
>> -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh`
>> +GIT_DESC !=$(top_srcdir)/scripts/git_hash.sh
>>  AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
>>  AM_CFLAGS += -DPLATFORM=${with_platform}
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
Ivan Khoronzhuk Oct. 15, 2015, 3:28 p.m. UTC | #4 
I build it at api-next and see this:
...
fatal: No names found, cannot describe anything.
   CC       odp_system_info.lo
fatal: No names found, cannot describe anything.
   CC       odp_thread.lo
fatal: No names found, cannot describe anything.
   CC       odp_thrmask.lo
   CC       odp_ticketlock.lo
   CC       odp_timer.lo
   CC       odp_time.lo
fatal: No names found, cannot describe anything.
fatal: No names found, cannot describe anything.
fatal: No names found, cannot describe anything.
fatal: No names found, cannot describe anything.
   CC       odp_version.lo
fatal: No names found, cannot describe anything.
   CC       odp_weak.lo
fatal: No names found, cannot describe anything.
   CC       pktio/io_ops.lo
   CC       pktio/loop.lo
fatal: No names found, cannot describe anything.
fatal: No names found, cannot describe anything.
   CC       pktio/netmap.lo
fatal: No names found, cannot describe anything.
   CC       pktio/socket.lo
fatal: No names found, cannot describe anything.
   CC       pktio/socket_mmap.lo
fatal: No names found, cannot describe anything.
   CC       arch/x86/odp_cpu_cycles.lo
fatal: No names found, cannot describe anything.
...

I had a talk with Maxim at connect and he was surprised.
We tried several methods with modifing dirs.
When I've used $() instead of `` it helped but broke smth else...


On 15.10.15 18:20, Nicolas Morey-Chaisemartin wrote:
> Maybe changing the directory before running git_hash.sh would fix your issue and keep the old make working ?
>
> Something like
>
> This was fixed some time ago:
>
> commit 06537738ea438c3e339fc269dedb4ed6c5e48f07
> Author: Anders Roxell <anders.roxell@linaro.org>
> Date:   Fri Aug 14 15:25:05 2015 +0200
>
>      scripts/git_hash: fix build from tar source
>
>      Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
>      Reviewed-and-tested-by: Mike Holmes <mike.holmes@linaro.org>
>      Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>
> Call to git_hash now adds a path to top_srcdir and handles non git dir
>
> On 10/15/2015 05:10 PM, Ivan Khoronzhuk wrote:
>> This reverts commit a9cc0fc700a4a8b9589404a18136b01974ca4aa3.
>>
>> This revert helps me to revert messages like:
>> "fatal: No names found, cannot describe anything." in case if I build
>> ODP outside of source catalog by:
>>
>> ../../odp/configure --enable-test-perf --enable-test-vald
>> make
>>
>> Seems it's connected with nesting `...`.
>>
>> Is someone going to fix it?
>>
>> ---
>>
>>   platform/Makefile.inc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/platform/Makefile.inc b/platform/Makefile.inc
>> index f64e37c..f232daa 100644
>> --- a/platform/Makefile.inc
>> +++ b/platform/Makefile.inc
>> @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la
>>
>>   AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
>>
>> -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh`
>> +GIT_DESC !=$(top_srcdir)/scripts/git_hash.sh
>>   AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
>>   AM_CFLAGS += -DPLATFORM=${with_platform}
>
Nicolas Morey-Chaisemartin Oct. 15, 2015, 3:35 p.m. UTC | #5 
The issue come from git_hash it self. Not the Makefile. I'm sending a patch right now.

On 10/15/2015 05:28 PM, Ivan Khoronzhuk wrote:
> I build it at api-next and see this:
> ...
> fatal: No names found, cannot describe anything.
>   CC       odp_system_info.lo
> fatal: No names found, cannot describe anything.
>   CC       odp_thread.lo
> fatal: No names found, cannot describe anything.
>   CC       odp_thrmask.lo
>   CC       odp_ticketlock.lo
>   CC       odp_timer.lo
>   CC       odp_time.lo
> fatal: No names found, cannot describe anything.
> fatal: No names found, cannot describe anything.
> fatal: No names found, cannot describe anything.
> fatal: No names found, cannot describe anything.
>   CC       odp_version.lo
> fatal: No names found, cannot describe anything.
>   CC       odp_weak.lo
> fatal: No names found, cannot describe anything.
>   CC       pktio/io_ops.lo
>   CC       pktio/loop.lo
> fatal: No names found, cannot describe anything.
> fatal: No names found, cannot describe anything.
>   CC       pktio/netmap.lo
> fatal: No names found, cannot describe anything.
>   CC       pktio/socket.lo
> fatal: No names found, cannot describe anything.
>   CC       pktio/socket_mmap.lo
> fatal: No names found, cannot describe anything.
>   CC       arch/x86/odp_cpu_cycles.lo
> fatal: No names found, cannot describe anything.
> ...
>
> I had a talk with Maxim at connect and he was surprised.
> We tried several methods with modifing dirs.
> When I've used $() instead of `` it helped but broke smth else...
>
>
> On 15.10.15 18:20, Nicolas Morey-Chaisemartin wrote:
>> Maybe changing the directory before running git_hash.sh would fix your issue and keep the old make working ?
>>
>> Something like
>>
>> This was fixed some time ago:
>>
>> commit 06537738ea438c3e339fc269dedb4ed6c5e48f07
>> Author: Anders Roxell <anders.roxell@linaro.org>
>> Date:   Fri Aug 14 15:25:05 2015 +0200
>>
>>      scripts/git_hash: fix build from tar source
>>
>>      Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
>>      Reviewed-and-tested-by: Mike Holmes <mike.holmes@linaro.org>
>>      Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>>
>> Call to git_hash now adds a path to top_srcdir and handles non git dir
>>
>> On 10/15/2015 05:10 PM, Ivan Khoronzhuk wrote:
>>> This reverts commit a9cc0fc700a4a8b9589404a18136b01974ca4aa3.
>>>
>>> This revert helps me to revert messages like:
>>> "fatal: No names found, cannot describe anything." in case if I build
>>> ODP outside of source catalog by:
>>>
>>> ../../odp/configure --enable-test-perf --enable-test-vald
>>> make
>>>
>>> Seems it's connected with nesting `...`.
>>>
>>> Is someone going to fix it?
>>>
>>> ---
>>>
>>>   platform/Makefile.inc | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/platform/Makefile.inc b/platform/Makefile.inc
>>> index f64e37c..f232daa 100644
>>> --- a/platform/Makefile.inc
>>> +++ b/platform/Makefile.inc
>>> @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la
>>>
>>>   AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
>>>
>>> -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh`
>>> +GIT_DESC !=$(top_srcdir)/scripts/git_hash.sh
>>>   AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
>>>   AM_CFLAGS += -DPLATFORM=${with_platform}
>>
>
diff mbox

Patch

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index f64e37c..f232daa 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -12,6 +12,6 @@  lib_LTLIBRARIES = $(LIB)/libodp.la
 
 AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
 
-GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh`
+GIT_DESC !=$(top_srcdir)/scripts/git_hash.sh
 AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
 AM_CFLAGS += -DPLATFORM=${with_platform}