From 0eb32a8e2e000218959606af4a54a55fc4598eea Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 28 Sep 2014 10:21:53 +0200
Subject: fix perl cross-compile and some modules on Darwin host

---
 mk/host-bottom.mk |  9 +++++++++
 mk/perl.mk        | 13 +++++++++++++
 mk/pkg-bottom.mk  |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 0a3add597..11c2aae26 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -66,6 +66,15 @@ ifeq (${HOST_STYLE},auto)
 endif
 ifeq (${HOST_STYLE},manual)
 	${MAKE} host-configure $(MAKE_TRACE)
+endif
+ifeq (${HOST_STYLE},perl)
+	@$(CMD_TRACE) "configuring perl module... "
+	cd ${WRKBUILD}; \
+		PATH='${HOST_PATH}' \
+		PERL_MM_USE_DEFAULT=1 \
+		PERL_AUTOINSTALL=--skipdeps \
+		$(HOST_PERL_ENV) \
+		perl-host Makefile.PL ${HOST_CONFIGURE_ARGS}
 endif
 	touch $@
 
diff --git a/mk/perl.mk b/mk/perl.mk
index a874a0b76..f4f6fcc66 100644
--- a/mk/perl.mk
+++ b/mk/perl.mk
@@ -6,6 +6,7 @@ PERL_ENV:=	AR="$(TARGET_AR)" \
 		FULL_AR="$(TARGET_AR)" \
 		CC="$(TARGET_CC)" \
 		CCFLAGS="$(TARGET_CFLAGS)" \
+		OPTIMIZE=" " \
 		LD="$(TARGET_CC)" \
 		LDDLFLAGS="-shared $(TARGET_LDFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -16,3 +17,15 @@ PERL_ENV:=	AR="$(TARGET_AR)" \
 		INSTALLVENDORARCH=$(PERL_SITEDIR)/$(PERL_ARCHNAME) \
 		INSTALLVENDORBIN=/usr/bin \
 		INSTALLVENDORSCRIPT=/usr/bin
+HOST_PERL_ENV:=	CC="$(CC_FOR_BUILD)" \
+		CCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		OPTIMIZE=" " \
+		LD="$(CC_FOR_BUILD)" \
+		LDDLFLAGS="-shared $(LDFLAGS_FOR_BUILD)" \
+		LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
+		DESTDIR=$(WRKINST) \
+		INSTALLDIRS=vendor \
+		INSTALLVENDORLIB=$(PERL_SITEDIR) \
+		INSTALLVENDORARCH=$(PERL_SITEDIR)/$(PERL_ARCHNAME) \
+		INSTALLVENDORBIN=/usr/bin \
+		INSTALLVENDORSCRIPT=/usr/bin
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index d81b8915c..4296c98c3 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -89,7 +89,7 @@ else ifneq ($(filter perl,${CONFIG_STYLE}),)
 		PERL_MM_USE_DEFAULT=1 \
 		PERL_AUTOINSTALL=--skipdeps \
 		$(PERL_ENV) \
-		perl Makefile.PL ${CONFIGURE_ARGS}
+		perl-host Makefile.PL ${CONFIGURE_ARGS}
 else ifeq ($(strip ${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
-- 
cgit v1.2.3