Skip to contentSkip to conversation

perl-netaddr-ip: remove !BR2_STATIC_LIBS constraint

PATCH New Francois Perrad 2 participants 4 messages Oct 26, 2015

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH 1/2 perl-netaddr-ip: remove !BR2_STATIC_LIBS constraint

with the option -noxs, the Pure Perl version is always built.

Signed-off-by Francois Perrad <[email protected]>
---
 package/perl-netaddr-ip/Config.in          | 3 ---
 package/perl-netaddr-ip/perl-netaddr-ip.mk | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)
package/perl-netaddr-ip/Config.in +0 -3
index 7ccb20a..1525830 100644
@@ -1,10 +1,7 @@
 config BR2_PACKAGE_PERL_NETADDR_IP
 	bool "perl-netaddr-ip"
-	depends on !BR2_STATIC_LIBS
 	help
 	  Manages IPv4 and IPv6 addresses and subnets
 
 	  https://metacpan.org/release/NetAddr-IP
 
-comment "perl-netaddr-ip needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
package/perl-netaddr-ip/perl-netaddr-ip.mk +2 -0
index 2e5a82a..f2eec6c 100644
@@ -10,6 +10,8 @@ PERL_NETADDR_IP_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKER
 PERL_NETADDR_IP_LICENSE = Artistic or GPLv1+
 PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying
 
+# we always build the Pure Perl version.
+# the build of the native part of NetAddr::IP::Util is buggy.
 PERL_NETADDR_IP_CONF_OPTS = -noxs
 
 $(eval $(perl-package))
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 2/2 scancpan: README as default license file

add this heuristic when no specific license file is found

Signed-off-by Francois Perrad <[email protected]>
---
 package/perl-db-file/perl-db-file.mk                           | 1 +
 package/perl-digest-sha1/perl-digest-sha1.mk                   | 1 +
 package/perl-io-socket-ssl/perl-io-socket-ssl.mk               | 1 +
 package/perl-mail-dkim/perl-mail-dkim.mk                       | 1 +
 package/perl-mailtools/perl-mailtools.mk                       | 1 +
 package/perl-timedate/perl-timedate.mk                         | 1 +
 package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk | 1 +
 package/perl-xml-sax-base/perl-xml-sax-base.mk                 | 1 +
 support/scripts/scancpan                                       | 3 +++
 9 files changed, 11 insertions(+)
package/perl-db-file/perl-db-file.mk +1 -0
index 1011632..6d611ea 100644
@@ -9,5 +9,6 @@ PERL_DB_FILE_SOURCE = DB_File-$(PERL_DB_FILE_VERSION).tar.gz
 PERL_DB_FILE_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PM/PMQS
 PERL_DB_FILE_DEPENDENCIES = berkeleydb
 PERL_DB_FILE_LICENSE = Artistic or GPLv1+
+PERL_DB_FILE_LICENSE_FILES = README
 
 $(eval $(perl-package))
package/perl-digest-sha1/perl-digest-sha1.mk +1 -0
index 1d7601b..52b9ec3 100644
@@ -8,5 +8,6 @@ PERL_DIGEST_SHA1_VERSION = 2.13
 PERL_DIGEST_SHA1_SOURCE = Digest-SHA1-$(PERL_DIGEST_SHA1_VERSION).tar.gz
 PERL_DIGEST_SHA1_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
 PERL_DIGEST_SHA1_LICENSE = Artistic or GPLv1+
+PERL_DIGEST_SHA1_LICENSE_FILES = README
 
 $(eval $(perl-package))
package/perl-io-socket-ssl/perl-io-socket-ssl.mk +1 -0
index fcf914c..a75d8af 100644
@@ -9,5 +9,6 @@ PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz
 PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR
 PERL_IO_SOCKET_SSL_DEPENDENCIES = perl-net-ssleay
 PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPLv1+
+PERL_IO_SOCKET_SSL_LICENSE_FILES = README
 
 $(eval $(perl-package))
package/perl-mail-dkim/perl-mail-dkim.mk +1 -0
index 8c7926f..03a3b74 100644
@@ -8,5 +8,6 @@ PERL_MAIL_DKIM_VERSION = 0.40
 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz
 PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JA/JASLONG
 PERL_MAIL_DKIM_DEPENDENCIES = perl-crypt-openssl-rsa perl-mailtools perl-net-dns
+PERL_MAIL_DKIM_LICENSE_FILES = README
 
 $(eval $(perl-package))
package/perl-mailtools/perl-mailtools.mk +1 -0
index 88f3a9f..d3c049d 100644
@@ -9,5 +9,6 @@ PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz
 PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV
 PERL_MAILTOOLS_DEPENDENCIES = perl-timedate
 PERL_MAILTOOLS_LICENSE = Artistic or GPLv1+
+PERL_MAILTOOLS_LICENSE_FILES = README
 
 $(eval $(perl-package))
package/perl-timedate/perl-timedate.mk +1 -0
index b7fcd08..4c594fb 100644
@@ -8,5 +8,6 @@ PERL_TIMEDATE_VERSION = 2.30
 PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz
 PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR
 PERL_TIMEDATE_LICENSE = Artistic or GPLv1+
+PERL_TIMEDATE_LICENSE_FILES = README
 
 $(eval $(perl-package))
package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk +1 -0
index 727b9b8..31b71c1 100644
@@ -8,5 +8,6 @@ PERL_XML_NAMESPACESUPPORT_VERSION = 1.11
 PERL_XML_NAMESPACESUPPORT_SOURCE = XML-NamespaceSupport-$(PERL_XML_NAMESPACESUPPORT_VERSION).tar.gz
 PERL_XML_NAMESPACESUPPORT_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERIGRIN
 PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPLv1+
+PERL_XML_NAMESPACESUPPORT_LICENSE_FILES = README
 
 $(eval $(perl-package))
package/perl-xml-sax-base/perl-xml-sax-base.mk +1 -0
index de47ea4..60dec31 100644
@@ -8,5 +8,6 @@ PERL_XML_SAX_BASE_VERSION = 1.08
 PERL_XML_SAX_BASE_SOURCE = XML-SAX-Base-$(PERL_XML_SAX_BASE_VERSION).tar.gz
 PERL_XML_SAX_BASE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM
 PERL_XML_SAX_BASE_LICENSE = Artistic or GPLv1+
+PERL_XML_SAX_BASE_LICENSE_FILES = README
 
 $(eval $(perl-package))
support/scripts/scancpan +3 -0
index 1835fea..0436d2a 100755
@@ -544,6 +544,9 @@ sub find_license_files {
         next if m|/|;
         push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|LICENSE)/i;
     }
+    if (scalar @license_files == 0 && $manifest =~ m/(README)[\n\s]/i) {
+        @license_files = ($1);
+    }
     return \@license_files;
 }
Signature · 1 line
2.5.0
#2 lore raw

PATCH 2/2 scancpan: README as default license file

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Francois" == Francois Perrad <[email protected]> writes:

add this heuristic when no specific license file is found

Signed-off-by Francois Perrad <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard