commit bb065396324bc0b2284e60926b33620da61f4379
parent eeb2ccb860d862230426c0142296244935b574ad
Author: Marcel Denia <naoir@gmx.net>
Date: Sun, 29 Nov 2015 21:49:24 +0100
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>
Diffstat:
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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'
