From 4248b8b72d6a8d5965885eb63fd610ea0bda7d54 Mon Sep 17 00:00:00 2001
From: Marcel Denia <naoir@gmx.net>
Date: Tue, 3 Feb 2015 11:33:24 +0100
Subject: [PATCH] perl: Add new CONFIG_PERL_THREADS option for enabling
 threading support

Signed-off-by: Marcel Denia <naoir@gmx.net>
---
 lang/perl/Config.in |  5 +++++
 lang/perl/Makefile  | 20 ++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lang/perl/Config.in b/lang/perl/Config.in
index 3cfa71daa..1fd0774d3 100644
--- a/lang/perl/Config.in
+++ b/lang/perl/Config.in
@@ -1,6 +1,11 @@
 menu "Configuration"
 	depends on PACKAGE_perl
 
+config PERL_THREADS
+    bool "Enable threading support"
+    default y if (mips || mipsel || x86 || x86_64 || armeb || arm) && (USE_UCLIBC || USE_EGLIBC)
+    default n
+
 config PERL_TESTS
 	bool "Include perl tests"
 	default n
diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index 8bf42bd74..5bba2ead8 100644
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@@ -44,6 +44,20 @@ endif
 TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS))
 TARGET_CPPFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CPPFLAGS))
 
+# Handle threading
+ifdef CONFIG_PERL_THREADS
+	PERL_CONFIG_SUFFIX:=-mt
+
+	# uclibc doesn't provide crypt_r(). Enable crypt() usage for glibc builds only
+	ifdef CONFIG_USE_EGLIBC
+		CRYPT_R_PROTO:=REENTRANT_PROTO_B_CCS
+		CRYPT:=define
+	else
+		CRYPT_R_PROTO:=0
+		CRYPT:=undef
+	endif
+endif
+
 # A list of disabled testss
 # ExtUtils tests are disabled for now as we don't support building
 # native extensions on the target machine at the moment
@@ -64,7 +78,7 @@ define Package/perl
   CATEGORY:=Languages
   TITLE:=The Perl intepreter
   URL:=http://www.perl.com/
-  DEPENDS:=+USE_EGLIBC:libbsd
+  DEPENDS:=+USE_EGLIBC:libbsd +PERL_THREADS:libpthread
 endef
 
 define Package/perl/description
@@ -108,8 +122,10 @@ define Build/Configure
 		-e 's!%%EXTRA_PERLLIBDIRS%%!$(EXTRA_LIBDIRS:%=-L%)!g' \
 		-e 's!%%IPV6%%!$(if $($(CONFIG_IPV6)),define,undef)!g' \
 		-e 's!%%HOSTMINIPERL%%!$(HOST_PERL_PREFIX)/bin/perl!g' \
+		-e 's!%%CRYPT_R_PROTO%%!$(CRYPT_R_PROTO)!g' \
+		-e 's!%%CRYPT%%!$(CRYPT)!g' \
 		-e 's!%%HOSTGENERATE%%!$(HOST_PERL_PREFIX)/bin/generate_uudmap!g' \
-		files/config.sh-$(patsubst i386,i486,$(ARCH)).in \
+		files/config.sh-$(patsubst i386,i486,$(ARCH))$(PERL_CONFIG_SUFFIX).in \
 		> $(PKG_BUILD_DIR)/config.sh
 	(cd $(PKG_BUILD_DIR) && ./Configure -S)
 	install -m 0644 $(PKG_BUILD_DIR)/config.h $(PKG_BUILD_DIR)/xconfig.h