diff options
-rw-r--r-- | meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Makefile.PL-avoid-running-assert_lib-at-configure.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb | 4 |
2 files changed, 43 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Makefile.PL-avoid-running-assert_lib-at-configure.patch b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Makefile.PL-avoid-running-assert_lib-at-configure.patch new file mode 100644 index 0000000000..2e010931d6 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl/0001-Makefile.PL-avoid-running-assert_lib-at-configure.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 577cdd6a571cfed506ec902b9021e60a2b854e4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Sun, 7 Jul 2024 22:32:30 -0700 | ||
4 | Subject: [PATCH] Makefile.PL: avoid running assert_lib at configure | ||
5 | |||
6 | The assert_lib will run the generated binary. When cross compiling, | ||
7 | e.g., for qemuarm64, we'll see error like below: | ||
8 | |||
9 | /usr/lib64/ld-linux-aarch64.so.1: No such file or directory | ||
10 | |||
11 | We should just skip library checking, because in OE, if these libs are | ||
12 | not available, the do_compile process will fail anyway. | ||
13 | |||
14 | Upstream-Status: Inappropriate [OE Specific] | ||
15 | |||
16 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
17 | --- | ||
18 | Makefile.PL | 6 +----- | ||
19 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
20 | |||
21 | diff --git a/Makefile.PL b/Makefile.PL | ||
22 | index a1b38f6..939cadc 100644 | ||
23 | --- a/Makefile.PL | ||
24 | +++ b/Makefile.PL | ||
25 | @@ -206,11 +206,7 @@ To change these settings, see 'perl Makefile.PL --help' and | ||
26 | MSG | ||
27 | |||
28 | print "Checking if libs are available for compiling...\n"; | ||
29 | - | ||
30 | -assert_lib( | ||
31 | - LIBS => ($opt->{'embedded'} ? $opt->{'embedded'} : $opt->{libs}), | ||
32 | -); | ||
33 | - | ||
34 | +print "Skip checking libs at configure stage as we are cross compiling.\n"; | ||
35 | print "Looks good.\n\n"; | ||
36 | |||
37 | sleep 1; | ||
38 | -- | ||
39 | 2.25.1 | ||
40 | |||
diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb index fc505fe1e8..99a9fcf628 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb | |||
@@ -15,7 +15,9 @@ DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" | |||
15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" | 15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" |
16 | 16 | ||
17 | SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" | 17 | SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" |
18 | SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master" | 18 | SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master \ |
19 | file://0001-Makefile.PL-avoid-running-assert_lib-at-configure.patch \ | ||
20 | " | ||
19 | 21 | ||
20 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
21 | 23 | ||