perl: Set gccversion configuration symbol correctly

This was previously manually set to '4.8.0'. Aside from just being incorrect,
it also breaks Errno's GCC5 detection.

Fixes #2044.

Signed-off-by: Marcel Denia <naoir@gmx.net>

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index 4906ee227b0993093f28d458905612de5ae833e5..6cfd289b7c1e01b57b0e3ea836ce6d43dc9e97a4 100644 (file)
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=perl
 PKG_VERSION:=5.22.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
                http://www.cpan.org/src/5.0 \
@@ -93,6 +93,7 @@ endef
 # Target perl
 define Build/Configure
        $(PERL_CMD) files/perlconfig.pl -Dowrt:target_cc='$(TARGET_CC)' \
+                                       -Dowrt:gccversion=$(CONFIG_GCC_VERSION) \
                                        -Dowrt:target_cross='$(TARGET_CROSS)' \
                                        -Dowrt:cflags='$(TARGET_CFLAGS_PERL) $(TARGET_CPPFLAGS_PERL)' \
                                        -Dowrt:ldflags='-rdynamic $(TARGET_LDFLAGS)' \

diff --git a/lang/perl/files/README.config b/lang/perl/files/README.config
index a7d14a75d471e4d7faff0c309494359ec1619a1f..572cf923d162b7a8dd3518eb32d2592c0b007dac 100644 (file)
--- a/lang/perl/files/README.config
+++ b/lang/perl/files/README.config
@@ -45,6 +45,7 @@ owrt:threads          yes/no              Whether to enable threading support.
 owrt:ipv6             define/undef        Whether to enable IPv6 support.
 owrt:target_cross     *                   Target architecture's host triplet.
 owrt:target_cc        *                   C compiler to use.
+owrt:gccversion       *                   target_cc's version number.
 owrt:cflags           *                   Additional C compiler flags.
 owrt:ldflags          *                   Additional linker flags.
 owrt:staging_dir      *                   Same as OpenWRT buildroot's

diff --git a/lang/perl/files/misc.config b/lang/perl/files/misc.config
index a1d93d36b8c46fe253603fe55ec15608242455e0..3e8f6bd75bfe32eb2196eb042242b68cbacff6b4 100644 (file)
--- a/lang/perl/files/misc.config
+++ b/lang/perl/files/misc.config
@@ -1,6 +1,6 @@
 cf_email='naoir@gmx.net'
 osvers='3.18.19'
-gccversion='4.8.0'
+gccversion="$owrt:gccversion"
 myhostname='OpenWrt'
 cf_time='Thu Jan 1 12:00:00 CEST 2015'