diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-12-04 08:12:59 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-06 11:09:52 +0000 |
| commit | a9ad0c267ee25e824bf80e73368c3164d0f0321e (patch) | |
| tree | 11c6ea0b62a249e5774d6d6c560dbdbf62353675 /meta/recipes-devtools/perl/perl_5.34.0.bb | |
| parent | cc60236033073d48a24dedfbb974ce01f83a4a62 (diff) | |
| download | poky-a9ad0c267ee25e824bf80e73368c3164d0f0321e.tar.gz | |
perl: replace a patch with a config option
Instead of patching in LDFLAGS into makefiles, simply
append them to 'lddlflags' (perl's keyword for 'linker flags').
See here for upstream discussions:
https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/406
https://github.com/arsv/perl-cross/pull/124
(From OE-Core rev: b9bc216c8d25ad3696c858bf12ebe893b8fe0edd)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl_5.34.0.bb')
| -rw-r--r-- | meta/recipes-devtools/perl/perl_5.34.0.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.34.0.bb b/meta/recipes-devtools/perl/perl_5.34.0.bb index 16d45ccff3..a6ae80f07e 100644 --- a/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/meta/recipes-devtools/perl/perl_5.34.0.bb | |||
| @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ | |||
| 10 | 10 | ||
| 11 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | 11 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ |
| 12 | file://perl-rdepends.txt \ | 12 | file://perl-rdepends.txt \ |
| 13 | file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ | ||
| 14 | file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \ | 13 | file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \ |
| 15 | file://errno_ver.diff \ | 14 | file://errno_ver.diff \ |
| 16 | file://native-perlinc.patch \ | 15 | file://native-perlinc.patch \ |
| @@ -59,6 +58,7 @@ do_configure:class-target() { | |||
| 59 | -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \ | 58 | -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \ |
| 60 | -Dlibpth='${libdir} ${base_libdir}' \ | 59 | -Dlibpth='${libdir} ${base_libdir}' \ |
| 61 | -Dglibpth='${libdir} ${base_libdir}' \ | 60 | -Dglibpth='${libdir} ${base_libdir}' \ |
| 61 | -Alddlflags=' ${LDFLAGS}' \ | ||
| 62 | ${PACKAGECONFIG_CONFARGS} | 62 | ${PACKAGECONFIG_CONFARGS} |
| 63 | 63 | ||
| 64 | #perl.c uses an ARCHLIB_EXP define to generate compile-time code that | 64 | #perl.c uses an ARCHLIB_EXP define to generate compile-time code that |
| @@ -83,6 +83,7 @@ do_configure:class-nativesdk() { | |||
| 83 | -Dsoname=libperl.so.5 \ | 83 | -Dsoname=libperl.so.5 \ |
| 84 | -Dvendorprefix=${prefix} \ | 84 | -Dvendorprefix=${prefix} \ |
| 85 | -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \ | 85 | -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \ |
| 86 | -Alddlflags=' ${LDFLAGS}' \ | ||
| 86 | ${PACKAGECONFIG_CONFARGS} | 87 | ${PACKAGECONFIG_CONFARGS} |
| 87 | 88 | ||
| 88 | # See the comment above | 89 | # See the comment above |
| @@ -96,6 +97,7 @@ do_configure:class-native() { | |||
| 96 | -Dsoname=libperl.so.5 \ | 97 | -Dsoname=libperl.so.5 \ |
| 97 | -Dvendorprefix=${prefix} \ | 98 | -Dvendorprefix=${prefix} \ |
| 98 | -Ui_xlocale \ | 99 | -Ui_xlocale \ |
| 100 | -Alddlflags=' ${LDFLAGS}' \ | ||
| 99 | ${PACKAGECONFIG_CONFARGS} | 101 | ${PACKAGECONFIG_CONFARGS} |
| 100 | } | 102 | } |
| 101 | 103 | ||
