summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Perrad <fperrad@gmail.com>2015-09-06 10:32:50 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-09-20 15:14:10 +0200
commitceb1214632efd4b81fc5c796391f23b6acf2dada (patch)
tree20bbe44031ad71cccdcfdc398b73b23ef8b1e5b3
parent259fe50be73e29025d70b6c166b2705286ce72f6 (diff)
downloadbuildroot-ceb1214632efd4b81fc5c796391f23b6acf2dada.tar.gz
buildroot-ceb1214632efd4b81fc5c796391f23b6acf2dada.zip
scancpan: fix detection of native module
When a module is native or depends of a native module, it must be disabled for static builds via its Config.in We detect native modules by looking at the filenames listed in the MANIFEST. If there is a file which looks like it contains code that much be compiled (e.g. .c, .h and so on...), then we exclude that module (and its dependencies) from static builds. That's what we tried to do so far, but failed when there was a comment on the same line as the filename in the manifest, like so: foo-bar.c # Bla bla bla Fix that by detecting either endof-line (as currently done) or end-of-string. For an example of failed build of perl-html-parser, see http://autobuild.buildroot.net/results/128/128671dfa23d843698a63220c2fac1f44e1d5845/ [Thomas: use better commit log proposed by Yann E. Morin.] Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/perl-html-parser/Config.in4
-rw-r--r--package/perl-libwww-perl/Config.in4
-rw-r--r--package/perl-mime-base64/Config.in4
-rw-r--r--package/perl-time-hires/Config.in4
-rwxr-xr-xsupport/scripts/scancpan2
5 files changed, 17 insertions, 1 deletions
diff --git a/package/perl-html-parser/Config.in b/package/perl-html-parser/Config.in
index afdd5237bb..8a725f1dbd 100644
--- a/package/perl-html-parser/Config.in
+++ b/package/perl-html-parser/Config.in
@@ -1,8 +1,12 @@
config BR2_PACKAGE_PERL_HTML_PARSER
bool "perl-html-parser"
+ depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_PERL_HTML_TAGSET
help
The HTML-Parser distribution is is a collection of modules that parse
and extract information from HTML documents
http://github.com/gisle/html-parser
+
+comment "perl-html-parser needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-libwww-perl/Config.in b/package/perl-libwww-perl/Config.in
index 3db0070a40..fc46bf1dff 100644
--- a/package/perl-libwww-perl/Config.in
+++ b/package/perl-libwww-perl/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PERL_LIBWWW_PERL
bool "perl-libwww-perl"
+ depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_PERL_ENCODE_LOCALE
select BR2_PACKAGE_PERL_FILE_LISTING
select BR2_PACKAGE_PERL_HTML_PARSER
@@ -16,3 +17,6 @@ config BR2_PACKAGE_PERL_LIBWWW_PERL
The World-Wide Web library for Perl
https://metacpan.org/release/libwww-perl
+
+comment "perl-libwww-perl needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-mime-base64/Config.in b/package/perl-mime-base64/Config.in
index 7e4858f280..22563dd5ad 100644
--- a/package/perl-mime-base64/Config.in
+++ b/package/perl-mime-base64/Config.in
@@ -1,7 +1,11 @@
config BR2_PACKAGE_PERL_MIME_BASE64
bool "perl-mime-base64"
+ depends on !BR2_STATIC_LIBS
help
This package contains a base64 encoder/decoder and a quoted-printable
encoder/decoder.
http://github.com/gisle/mime-base64
+
+comment "perl-mime-base64 needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-time-hires/Config.in b/package/perl-time-hires/Config.in
index e10c18a0d2..37bad71d85 100644
--- a/package/perl-time-hires/Config.in
+++ b/package/perl-time-hires/Config.in
@@ -1,6 +1,10 @@
config BR2_PACKAGE_PERL_TIME_HIRES
bool "perl-time-hires"
+ depends on !BR2_STATIC_LIBS
help
High resolution alarm, sleep, gettimeofday, interval timers
http://search.cpan.org/dist/Time-HiRes/HiRes.pm
+
+comment "perl-time-hires needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/support/scripts/scancpan b/support/scripts/scancpan
index 1121212594..a33ec8bf46 100755
--- a/support/scripts/scancpan
+++ b/support/scripts/scancpan
@@ -534,7 +534,7 @@ sub is_xs {
# This heuristic determines if a module is a native extension, by searching
# some file extension types in the MANIFEST of the distribution.
# It was inspired by http://deps.cpantesters.org/static/purity.html
- return $manifest =~ m/\.(swg|xs|c|h|i)\n/;
+ return $manifest =~ m/\.(swg|xs|c|h|i)[\n\s]/;
}
sub find_license_files {
OpenPOWER on IntegriCloud