Skip to contentSkip to conversation

package/python-avro: don't refer to avro-c version variable

PATCH Applied Romain Naour 2 participants 2 messages May 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/python-avro: don't refer to avro-c version variable

Like for other packages sharing the same version number, we can't rely on Make variable expansion. It's working by chance since avro-c is sorted before python-avro by the Buildroot main Makefile [1].

[1] https://git.buildroot.net/buildroot/tree/Makefile?h=2022.02.1#n533

Cc Titouan Christophe <[email protected]>
---
 package/avro-c/avro-c.mk           | 1 +
 package/python-avro/python-avro.mk | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
package/avro-c/avro-c.mk +1 -0
index 262a0fee5f..f55c579656 100644
@@ -4,6 +4,7 @@
 #
 ################################################################################
 
+# When updating the version, please also update python-avro
 AVRO_C_VERSION = 1.11.0
 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c
 AVRO_C_LICENSE = Apache-2.0
package/python-avro/python-avro.mk +3 -1
index 0c4c431777..973107979c 100644
@@ -4,7 +4,9 @@
 #
 ################################################################################
 
-PYTHON_AVRO_VERSION = $(AVRO_C_VERSION)
+# Not possible to directly refer to avro-c variables, because of
+# first/second expansion trickery...
+PYTHON_AVRO_VERSION = 1.11.0
 PYTHON_AVRO_SITE = \
 	https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py
 PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz
Signature · 6 lines
2.35.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Romain, All,

On 2022-05-14 21:57 +0200, Romain Naour spake thusly:

Quoted 31 lines

Like for other packages sharing the same version number, we can't rely on Make variable expansion. It's working by chance since avro-c is sorted before python-avro by the Buildroot main Makefile [1].

[1] https://git.buildroot.net/buildroot/tree/Makefile?h=2022.02.1#n533

Cc Titouan Christophe <[email protected]>
---
 package/avro-c/avro-c.mk           | 1 +
 package/python-avro/python-avro.mk | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
package/avro-c/avro-c.mk +1 -0
index 262a0fee5f..f55c579656 100644
@@ -4,6 +4,7 @@
 #
 ################################################################################
 
+# When updating the version, please also update python-avro
 AVRO_C_VERSION = 1.11.0
 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c
 AVRO_C_LICENSE = Apache-2.0
package/python-avro/python-avro.mk +0 -0
index 0c4c431777..973107979c 100644

package/python-avro/python-avro.mk line 8

Quoted 6 lines
package/python-avro/python-avro.mk +2 -1
@@ -4,7 +4,9 @@
 #
 ################################################################################
 
-PYTHON_AVRO_VERSION = $(AVRO_C_VERSION)
+# Not possible to directly refer to avro-c variables, because of
+# first/second expansion trickery...

In fact, this is not really a problem with first/secod expansion like I thought initially.

So, first, the current code does work, because avro-c is parsed before python-avro, so AVRO_C_VERSION *is* defined by the moment we call $(eval $(python-package)) in pyhon-avro.mk.

And this is what is important: the _VERSION must be known by the time a *-package infra is called, becasue _VERSION is used to generate Makefile code, in the form of rules that boils down to:

$(pkgname-$($(pkgname)_VERSION): some-stamp-file
some commands to run

So, if _VERSION is defined after *-package is caleed, that breaks; if it is defined before, that works.

However, this is still fragile, and we try to avoid it. For example, mesa3d and mesa3d-headers duplicate the version string. That's because $(wildcard package/*/*.mk) would sort them in the inverse order we'd want::

package/mesa3d-headers/mesa3d-headers.mk
package/mesa3d/mesa3d.mk

So, mesa3d-headers can't use mesa3d version string (note the other way around would work).

So, I changed that comment to also point to avro-c when updating the version (and as I forgot to commit, I had to push a follow-up patch).

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 11 lines
package/python-avro/python-avro.mk +1 -0
+PYTHON_AVRO_VERSION = 1.11.0
 PYTHON_AVRO_SITE = \
 	https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py
 PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz
Signature · 6 lines
2.35.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot