Преглед изворни кода

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>
Marcel Denia пре 9 година
родитељ
комит
bb06539632
3 измењених фајлова са 4 додато и 2 уклоњено
  1. 2
    1
      lang/perl/Makefile
  2. 1
    0
      lang/perl/files/README.config
  3. 1
    1
      lang/perl/files/misc.config

+ 2
- 1
lang/perl/Makefile Прегледај датотеку

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=perl
11 11
 PKG_VERSION:=5.22.0
12
-PKG_RELEASE:=4
12
+PKG_RELEASE:=5
13 13
 
14 14
 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
15 15
 		http://www.cpan.org/src/5.0 \
@@ -93,6 +93,7 @@ endef
93 93
 # Target perl
94 94
 define Build/Configure
95 95
 	$(PERL_CMD) files/perlconfig.pl -Dowrt:target_cc='$(TARGET_CC)' \
96
+	                                -Dowrt:gccversion=$(CONFIG_GCC_VERSION) \
96 97
 	                                -Dowrt:target_cross='$(TARGET_CROSS)' \
97 98
 	                                -Dowrt:cflags='$(TARGET_CFLAGS_PERL) $(TARGET_CPPFLAGS_PERL)' \
98 99
 	                                -Dowrt:ldflags='-rdynamic $(TARGET_LDFLAGS)' \

+ 1
- 0
lang/perl/files/README.config Прегледај датотеку

@@ -45,6 +45,7 @@ owrt:threads          yes/no              Whether to enable threading support.
45 45
 owrt:ipv6             define/undef        Whether to enable IPv6 support.
46 46
 owrt:target_cross     *                   Target architecture's host triplet.
47 47
 owrt:target_cc        *                   C compiler to use.
48
+owrt:gccversion       *                   target_cc's version number.
48 49
 owrt:cflags           *                   Additional C compiler flags.
49 50
 owrt:ldflags          *                   Additional linker flags.
50 51
 owrt:staging_dir      *                   Same as OpenWRT buildroot's

+ 1
- 1
lang/perl/files/misc.config Прегледај датотеку

@@ -1,6 +1,6 @@
1 1
 cf_email='naoir@gmx.net'
2 2
 osvers='3.18.19'
3
-gccversion='4.8.0'
3
+gccversion="$owrt:gccversion"
4 4
 myhostname='OpenWrt'
5 5
 cf_time='Thu Jan 1 12:00:00 CEST 2015'
6 6