[Buildroot] [PATCH v2 17/23] package/perl: apply the perl-cross even for the host variant

[Florian Fainelli via buildroot <buildroot@buildroot.org>]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Currently, ther host and target variants have diffeerent source tree,
because the target variant extracts perl-cross, while the host variant
does not.

This goes against having a single source tree for both, to ease
out-of-tree builds.

However, extracting the perl-cross archive has no impact of the standard
build; it only ever adds new files that are not used by the original,
native-only buildsystem.

So, we can extrat perl-cross for the host variant as well, by re-using
the same hook. We also need to apply the config.{sub,guess} hook.

Now that both variants extract perl-cross, the patch for perl-cross does
not need to be applied by a target-only hook anymore: move it back to
the package patch directory, so that it is applied for both variants, and
drop the PERL_POST_PATCH_HOOKS hook introduced for it. This reverts
8dea6e7c089c ("package/perl: apply perl-cross patch only on target perl").

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <francois.perrad@gadz.org>
cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit d2ad97e0eeff39fc89a58b589f19094824402756)
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
 ...01-configure-keep-_GNU_SOURCE-in-build-flags.patch |  0
 package/perl/perl.mk                                  | 11 ++---------
 2 files changed, 2 insertions(+), 9 deletions(-)
 rename package/perl/{perl-cross => }/0001-configure-keep-_GNU_SOURCE-in-build-flags.patch (100%)

diff --git a/package/perl/perl-cross/0001-configure-keep-_GNU_SOURCE-in-build-flags.patch b/package/perl/0001-configure-keep-_GNU_SOURCE-in-build-flags.patch
similarity index 100%
rename from package/perl/perl-cross/0001-configure-keep-_GNU_SOURCE-in-build-flags.patch
rename to package/perl/0001-configure-keep-_GNU_SOURCE-in-build-flags.patch
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 43820cfcc33a..0892299ed00a 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -31,21 +31,14 @@ define PERL_CROSS_EXTRACT
 	mv $(@D)/cnf/diffs/perl5-5.42.0 $(@D)/cnf/diffs/perl5-5.42.3
 endef
 PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
-
-# We need to patch perl-cross, but perl-cross is extracted over the
-# target perl sources only (and not the host variant). So we apply the
-# patch only for the target case using a post patch hook.
-define PERL_CROSS_PATCH
-	$(APPLY_PATCHES) $(@D) $(PERL_PKGDIR)/perl-cross \
-		0001-configure-keep-_GNU_SOURCE-in-build-flags.patch
-endef
-PERL_POST_PATCH_HOOKS += PERL_CROSS_PATCH
+HOST_PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
 
 # Even though perl is not an autotools-package, it uses config.sub and
 # config.guess. Up-to-date versions of these files may be needed to build perl
 # on newer host architectures, so we borrow the hook which updates them from the
 # autotools infrastructure.
 PERL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
+HOST_PERL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
 
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
 PERL_DEPENDENCIES += berkeleydb
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot