mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
perl: use the shortVersion for site and vendor.
This commit is contained in:
Jerome Duval
@@ -1,4 +1,4 @@
|
||||
From e3d2e902e1e4225a8de7854f53c4572e8e22bd5c Mon Sep 17 00:00:00 2001
|
||||
From 9f27041eee31229675fa88a6fdddf299e586914a Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sun, 22 Sep 2013 14:52:03 +0200
|
||||
Subject: Tell perl that BFS has a link count of 1
|
||||
@@ -19,10 +19,10 @@ index 817c6d9..c3298a6 100644
|
||||
# fall-through if we can't unlink now
|
||||
_deferred_unlink($fh, $path, 0);
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 89b53ae715b1c82f7d666258aa8440e7a3e530e8 Mon Sep 17 00:00:00 2001
|
||||
From 33fc48f52ae22336a1432055dd07223debb1cee7 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sun, 22 Sep 2013 14:52:53 +0200
|
||||
Subject: Haiku defines, but does not implement O_EXLOCK
|
||||
@@ -43,10 +43,10 @@ index ff8c7f9..4364bf6 100644
|
||||
} else {
|
||||
plan tests => 4;
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 6748fefa6d9eb99d564fc7d9227a1b164bac7eec Mon Sep 17 00:00:00 2001
|
||||
From 61640c72c6eead2d43671f3c9c9ca9ff1b181fb6 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sun, 22 Sep 2013 14:53:40 +0200
|
||||
Subject: haiku sets all its specifics via Configure
|
||||
@@ -103,10 +103,10 @@ index fa8ebe5..0f09f53 100644
|
||||
-
|
||||
+# haiku sets all its specifics via Configure
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 2b70284ebb3298507281413b1509babb8d5e91ce Mon Sep 17 00:00:00 2001
|
||||
From 84af5190c5255be829ce88e5e31868a583832b47 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sun, 22 Sep 2013 14:54:15 +0200
|
||||
Subject: Tell perl that Haiku needs haikuish.h installed as well
|
||||
@@ -129,10 +129,10 @@ index af61203..ed94fe6 100755
|
||||
|
||||
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From e568e5ca5a7b2221d47df55ee091c1051e5cfd71 Mon Sep 17 00:00:00 2001
|
||||
From 914528ca35f7a394db694ef892651420977e0157 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sun, 22 Sep 2013 14:55:13 +0200
|
||||
Subject: Fix handling of exit codes on Haiku
|
||||
@@ -180,10 +180,10 @@ index ce3270e..cab9a79 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 28176c64ece7fa6a7463e37be51b178b47af880c Mon Sep 17 00:00:00 2001
|
||||
From 16d97441ee948b2813fde6b2aa869af70aabbe8e Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sun, 22 Sep 2013 15:00:44 +0200
|
||||
Subject: Fix include path of errno.h
|
||||
@@ -203,10 +203,10 @@ index d345e98..1fe9312 100644
|
||||
} elsif ($^O eq 'vos') {
|
||||
# avoid problem where cpp returns non-POSIX pathnames
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From defcd2cb6678102074a36a05f73c40ec6d5b9151 Mon Sep 17 00:00:00 2001
|
||||
From 7dcaa0868e6eccf7019f9e6c6bb81366aa0ee852 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sat, 28 Sep 2013 13:46:42 +0200
|
||||
Subject: Adjust ExtUtils::MakeMaker for PM-Haiku.
|
||||
@@ -307,10 +307,10 @@ index 0000000..81e5f99
|
||||
+__END__
|
||||
+
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From f1a15827cefe0f511ee9c83e9f1bc17637017153 Mon Sep 17 00:00:00 2001
|
||||
From 2d0804e071dfc13841b9d8659baf987538e2c721 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Tue, 8 Oct 2013 22:16:37 +0200
|
||||
Subject: Avoid using -rpath for dynamic modules.
|
||||
@@ -355,10 +355,10 @@ index 81e5f99..25ace13 100644
|
||||
__END__
|
||||
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 3e15b37383dac689ccfb1e0a425d00b3a88cb94d Mon Sep 17 00:00:00 2001
|
||||
From e464c8046abea32d331f9af2c0b8fe6d1aaad228 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Tue, 8 Oct 2013 22:17:26 +0200
|
||||
Subject: Add script sitecustomize.pl for setting up @INC as we need it.
|
||||
@@ -407,10 +407,10 @@ index 0000000..a321e51
|
||||
+}
|
||||
+@INC = @newINC;
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 3bd84e84c96e2f6177efe4e9635b49518da53681 Mon Sep 17 00:00:00 2001
|
||||
From 4484b47eacf707786e595c4dc90fc7c2faba45a6 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Wed, 9 Oct 2013 20:29:38 +0200
|
||||
Subject: Fix initialization check for CPAN.
|
||||
@@ -437,10 +437,10 @@ index 531c115..b9d87d7 100644
|
||||
&& -w $Config{installarchlib}
|
||||
&& -w $Config{installsitelib}
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 416a2fad2370555efb3ada6533dc9b358e807f50 Mon Sep 17 00:00:00 2001
|
||||
From 53011d2e543af3a605f791d87989da89cb449bb4 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Sun, 13 Oct 2013 17:32:50 +0200
|
||||
Subject: Add support for HAIKU_USE_VENDOR_DIRECTORIES.
|
||||
@@ -513,17 +513,17 @@ index 25ace13..8a04ead 100644
|
||||
__END__
|
||||
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From a84052db950febbc6e2e1527993b3f0f0b06b566 Mon Sep 17 00:00:00 2001
|
||||
From 76f644d2913e2aaf2f0477da7ec35bc40a40230f Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 9 Jun 2017 21:30:33 +0200
|
||||
Subject: disable fstack-protector for Haiku
|
||||
|
||||
|
||||
diff --git a/Configure b/Configure
|
||||
index 3259249..34e5d7d 100755
|
||||
index bdcfaf1..acdd3da 100755
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -5507,6 +5507,7 @@ default|recommended)
|
||||
@@ -535,5 +535,45 @@ index 3259249..34e5d7d 100755
|
||||
?*) set stack-protector-strong -fstack-protector-strong
|
||||
eval $checkccflag
|
||||
--
|
||||
2.12.2
|
||||
2.16.2
|
||||
|
||||
|
||||
From 0ad4290008db0015555413d6efecfbb98e5589e3 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 14 Mar 2018 21:33:54 +0100
|
||||
Subject: sitecustomize.pl: use the shortVersion for site and vendor.
|
||||
|
||||
|
||||
diff --git a/sitecustomize.pl b/sitecustomize.pl
|
||||
index a321e51..76c0e46 100644
|
||||
--- a/sitecustomize.pl
|
||||
+++ b/sitecustomize.pl
|
||||
@@ -8,17 +8,17 @@ use Config;
|
||||
my @ourINC = (
|
||||
"/boot/home/config/lib/perl5/$Config{version}/$Config{archname}",
|
||||
"/boot/home/config/lib/perl5/$Config{version}",
|
||||
- "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}",
|
||||
- "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}",
|
||||
- "/boot/home/config/lib/perl5/vendor_perl/$Config{version}/$Config{archname}",
|
||||
- "/boot/home/config/lib/perl5/vendor_perl/$Config{version}",
|
||||
+ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{revision}.$Config{patchlevel}/$Config{archname}",
|
||||
+ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{revision}.$Config{patchlevel}",
|
||||
+ "/boot/home/config/lib/perl5/vendor_perl/$Config{revision}.$Config{patchlevel}/$Config{archname}",
|
||||
+ "/boot/home/config/lib/perl5/vendor_perl/$Config{revision}.$Config{patchlevel}",
|
||||
"/boot/home/config/lib/perl5/vendor_perl",
|
||||
"/boot/system/lib/perl5/$Config{version}/$Config{archname}",
|
||||
"/boot/system/lib/perl5/$Config{version}",
|
||||
- "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}",
|
||||
- "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}",
|
||||
- "/boot/system/lib/perl5/vendor_perl/$Config{version}/$Config{archname}",
|
||||
- "/boot/system/lib/perl5/vendor_perl/$Config{version}",
|
||||
+ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{revision}.$Config{patchlevel}/$Config{archname}",
|
||||
+ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{revision}.$Config{patchlevel}",
|
||||
+ "/boot/system/lib/perl5/vendor_perl/$Config{revision}.$Config{patchlevel}/$Config{archname}",
|
||||
+ "/boot/system/lib/perl5/vendor_perl/$Config{revision}.$Config{patchlevel}",
|
||||
"/boot/system/lib/perl5/vendor_perl",
|
||||
);
|
||||
my @newINC;
|
||||
--
|
||||
2.16.2
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.perl.org/"
|
||||
COPYRIGHT="1993-2017 Larry Wall and others"
|
||||
LICENSE="GNU GPL v1
|
||||
Artistic"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
perlShortVersion="${portVersion%.*}"
|
||||
SOURCE_URI="http://www.cpan.org/src/perl-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="e763aa485e8dc1a70483dbe6d615986bbf32b977f38016480d68c99237e701dd"
|
||||
|
||||
Reference in New Issue
Block a user