diff options
-rw-r--r-- | meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch | 37 | ||||
-rw-r--r-- | meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb (renamed from meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb) | 5 |
2 files changed, 2 insertions, 40 deletions
diff --git a/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch b/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch deleted file mode 100644 index a3dc381882..0000000000 --- a/meta-oe/recipes-support/libgpiod/files/0001-build-don-t-expect-automake-to-set-PYTHON.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 3c461786feb1d5aa1ed2a911942a5f9fbc8b8086 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | ||
3 | Date: Tue, 24 Jan 2023 17:38:43 +0100 | ||
4 | Subject: [libgpiod v1.6.x][PATCH] build: don't expect automake to set $PYTHON | ||
5 | |||
6 | It seems that the implementation of AM_PATH_PYTHON() changed in automake | ||
7 | recently and no longer sets $PYTHON variable which breaks the build on | ||
8 | some systems. | ||
9 | |||
10 | We know we use python3 so use python3-config explicitly. | ||
11 | |||
12 | Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | ||
13 | --- | ||
14 | Upstream-Status: Accepted | ||
15 | |||
16 | configure.ac | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 3149384..0460810 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -204,9 +204,9 @@ then | ||
24 | AC_MSG_ERROR([python3-config not found - needed for python bindings]) | ||
25 | fi | ||
26 | AS_IF([test -z "$PYTHON_CPPFLAGS"], | ||
27 | - [AC_SUBST(PYTHON_CPPFLAGS, [`$PYTHON-config --includes`])]) | ||
28 | + [AC_SUBST(PYTHON_CPPFLAGS, [`python3-config --includes`])]) | ||
29 | AS_IF([test -z "$PYTHON_LIBS"], | ||
30 | - [AC_SUBST(PYTHON_LIBS, [`$PYTHON-config --libs`])]) | ||
31 | + [AC_SUBST(PYTHON_LIBS, [`python3-config --libs`])]) | ||
32 | fi | ||
33 | |||
34 | AC_CHECK_PROG([has_doxygen], [doxygen], [true], [false]) | ||
35 | -- | ||
36 | 2.37.2 | ||
37 | |||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb index 5164e7e021..70a77c8834 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb | |||
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" | |||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ | 8 | https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | file://0001-build-don-t-expect-automake-to-set-PYTHON.patch \ | ||
11 | " | 10 | " |
12 | 11 | ||
13 | SRC_URI[md5sum] = "28e79f6f70fee1da9079558d8b7b3736" | 12 | SRC_URI[md5sum] = "7a2cca6ead9296c27e877070dd8853bc" |
14 | SRC_URI[sha256sum] = "841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c5dddc7" | 13 | SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5" |
15 | 14 | ||
16 | inherit autotools pkgconfig python3native ptest | 15 | inherit autotools pkgconfig python3native ptest |
17 | 16 | ||