treewide: move all perl packages into its own folder

This makes it in sync with Python packages.
Python packages has its own place in /lang/python
Perl does not, so this fixes it.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
Josef Schlehofer
2025-06-17 22:43:38 +02:00
parent 04b7b67e75
commit e9f4aa38ef
97 changed files with 48 additions and 48 deletions

View File

@@ -0,0 +1,49 @@
#
# Copyright (C) 2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=perl-www-curl
PKG_VERSION:=4.17
PKG_RELEASE:=7
PKG_SOURCE_URL:=https://www.cpan.org/authors/id/S/SZ/SZBALINT/
PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz
PKG_HASH:=52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba
PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Curl-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include ../perlmod.mk
define Package/perl-www-curl
SUBMENU:=Perl
SECTION:=lang
CATEGORY:=Languages
TITLE:=Perl bindings to libcurl
URL:=http://search.cpan.org/dist/WWW-Curl/
DEPENDS:=perl +libcurl +perlbase-essential +perlbase-xsloader
endef
define Build/Configure
$(call perlmod/Configure,$(STAGING_DIR)/usr/include,)
endef
define Build/Compile
$(call perlmod/Compile,,)
endef
define Package/perl-www-curl/install
$(call perlmod/Install,$(1),WWW/Curl WWW/Curl.pm auto/WWW/Curl)
endef
$(eval $(call BuildPackage,perl-www-curl))

View File

@@ -0,0 +1,74 @@
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,31 +12,31 @@ no_index directory => 'template';
repository 'http://github.com/szbalint/WWW--Curl';
# This is a hack. If you have libcurl installed, just specify curl.h below
# and comment out this line.
-if ($^O ne 'MSWin32') {
- if (!$ENV{CURL_CONFIG}) {
- requires_external_bin 'curl-config';
- }
-} else {
- print "Sorry, no automated install is available on Windows,\n".
- "please see the README.Win32 file on instructions for a manual install.\n";
- exit(0);
-}
-
-my $curl_config = $ENV{CURL_CONFIG} || 'curl-config';
-
-my $vernum = `${curl_config} --vernum`; chomp $vernum;
-my $version = `${curl_config} --version`; chomp $version;
-
-my $minimum_ver = hex("070a08");
-
-if ($vernum && hex($vernum) <= $minimum_ver) {
- print "Your currently installed libcurl version - $version - is too old.\n".
- "This module doesn't seek compatibility with versions older than 7.10.8\n".
- "Proceed manually if you know what you're doing.\n";
- exit(0);
-}
-
-print "The version is $version\n";
+#if ($^O ne 'MSWin32') {
+# if (!$ENV{CURL_CONFIG}) {
+# requires_external_bin 'curl-config';
+# }
+#} else {
+# print "Sorry, no automated install is available on Windows,\n".
+# "please see the README.Win32 file on instructions for a manual install.\n";
+# exit(0);
+#}
+#
+#my $curl_config = $ENV{CURL_CONFIG} || 'curl-config';
+#
+#my $vernum = `${curl_config} --vernum`; chomp $vernum;
+#my $version = `${curl_config} --version`; chomp $version;
+#
+#my $minimum_ver = hex("070a08");
+#
+#if ($vernum && hex($vernum) <= $minimum_ver) {
+# print "Your currently installed libcurl version - $version - is too old.\n".
+# "This module doesn't seek compatibility with versions older than 7.10.8\n".
+# "Proceed manually if you know what you're doing.\n";
+# exit(0);
+#}
+#
+#print "The version is $version\n";
my @includes = qw();
my ($cflags,$lflags, $ldflags) = ('','','');
@@ -58,10 +58,10 @@ if ($^O ne 'MSWin32') {
# Get curl to tell us where it is, if we can.
#
-if ($^O ne 'MSWin32') {
- $cflags = `${curl_config} --cflags`;
- $lflags = `${curl_config} --libs`;
-}
+#if ($^O ne 'MSWin32') {
+# $cflags = `${curl_config} --cflags`;
+# $lflags = `${curl_config} --libs`;
+#}
# can't find link flags, make some guesses
if (!defined($lflags)) {

View File

@@ -0,0 +1,29 @@
From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 12 Sep 2016 14:40:44 +0200
Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
CURL_STRICTER leaked into curl-constants.c when building against
curl-7.50.2. This is a preprocessor only macro without a value.
CPAN RT#117793
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
Makefile.PL | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
close H;
for my $e (sort @syms) {
- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
+ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
next;
}
my ($group) = $e =~ m/^([^_]+_)/;

View File

@@ -0,0 +1,11 @@
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -39,7 +39,7 @@ repository 'http://github.com/szbalint/
#print "The version is $version\n";
my @includes = qw();
-my ($cflags,$lflags, $ldflags) = ('','','');
+my ($cflags,$lflags, $ldflags) = ('','-lcurl','');
# You may need to specify where to find curl.h on your platform
# These are guesses only, in case curl-config is not telling us.

View File

@@ -0,0 +1,56 @@
--- a/Curl.xs
+++ b/Curl.xs
@@ -70,7 +70,7 @@ typedef struct {
typedef struct {
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
struct CURLM *curlm;
#else
struct void *curlm;
@@ -234,7 +234,7 @@ static perl_curl_multi * perl_curl_multi
{
perl_curl_multi *self;
Newz(1, self, 1, perl_curl_multi);
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
self->curlm=curl_multi_init();
#else
croak("curl version too old to support curl_multi_init()");
@@ -245,7 +245,7 @@ static perl_curl_multi * perl_curl_multi
/* delete the multi */
static void perl_curl_multi_delete(perl_curl_multi *self)
{
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
if (self->curlm)
curl_multi_cleanup(self->curlm);
Safefree(self);
@@ -1065,7 +1065,7 @@ curl_multi_add_handle(curlm, curl)
WWW::Curl::Multi curlm
WWW::Curl::Easy curl
CODE:
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
curl_multi_add_handle(curlm->curlm, curl->curl);
#endif
@@ -1074,7 +1074,7 @@ curl_multi_remove_handle(curlm, curl)
WWW::Curl::Multi curlm
WWW::Curl::Easy curl
CODE:
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
curl_multi_remove_handle(curlm->curlm, curl->curl);
#endif
@@ -1149,7 +1149,7 @@ curl_multi_perform(self)
PREINIT:
int remaining;
CODE:
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
while(CURLM_CALL_MULTI_PERFORM ==
curl_multi_perform(self->curlm, &remaining));
RETVAL = remaining;

View File

@@ -0,0 +1,11 @@
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
close H;
for my $e (sort @syms) {
- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
+ if($e =~ /(OBSOLETE|^CURL_EXTERN|CURLOPT\z|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z|WIN32)/) {
next;
}
my ($group) = $e =~ m/^([^_]+_)/;

View File

@@ -0,0 +1,11 @@
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
close H;
for my $e (sort @syms) {
- if($e =~ /(OBSOLETE|^CURL_EXTERN|CURLOPT\z|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z|WIN32)/) {
+ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_|^CURL_WIN32\z|^CURL_DEPRECATED\z|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|^CURLOPT\z)/) {
next;
}
my ($group) = $e =~ m/^([^_]+_)/;