haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add automatic vendor modules suppport to perl.

Browse Source 
* Adjust MakeMaker to automatically switch to vendor directories if
  HAIKU_USE_VENDOR_DIRECTORIES is set.
This commit is contained in:
Oliver Tappe
2013-10-15 11:50:00 +02:00
parent ce92af6257
commit 00030aa4de
1 changed files with 86 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
dev-lang/perl/patches/perl-5.18.1.patchset
View File

@@ -1,4 +1,4 @@
From f0e56e8de699304c16cf84ddad23e70a8d4f1113 Mon Sep 17 00:00:00 2001
From 4bef2ada1d8a38b4dff88f0659a3b9e181bf1950 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
@@ -22,7 +22,7 @@ index ac57c26..759690c 100644
1.8.3.4
From eeb73e685719100cbaf14aa80936acf629b09358 Mon Sep 17 00:00:00 2001
From e54a8f98abfea2be3eec53b4bbe2cbaaf9f39139 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
@@ -46,7 +46,7 @@ index ff8c7f9..4364bf6 100644
1.8.3.4
From ab08a333ba288c781badc4ad0918f478eccb623c Mon Sep 17 00:00:00 2001
From 30f81dcecdfb9c49ad8824314348cd23ef43ec0f 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
@@ -106,7 +106,7 @@ index fa8ebe5..0f09f53 100644
1.8.3.4
From 1e0db8890d721318e8f6ed2b7af01f7a2b1530f4 Mon Sep 17 00:00:00 2001
From 187343906d2ed78aa5e5b4b3a6cfb7ad199c726f 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
@@ -132,7 +132,7 @@ index e64b1c3..8ae20cc 100755
1.8.3.4
From 13c237d527f3fab4420db9098e9da75c7e2d9a03 Mon Sep 17 00:00:00 2001
From 936c1f0486788b814578ea469f4441d1755dac71 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
@@ -183,7 +183,7 @@ index 02e57c6..e836410 100644
1.8.3.4
From dc2c883ce7880715e3528ffb8fe3468816b4ccdf Mon Sep 17 00:00:00 2001
From c8c19c0e4b6493dd5122749ba0f0d7d8b1b89117 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
@@ -206,7 +206,7 @@ index b707911..7999ae4 100644
1.8.3.4
From 53e43eb85a7666f85e081bee43be542ce733d95d Mon Sep 17 00:00:00 2001
From 46ed1ae1bc678bda0d0fe3efb589847798afab58 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.
@@ -339,7 +339,7 @@ index 0000000..81e5f99
1.8.3.4
From bd31bc50a49c6b4585666656b73b9dc2d9928c61 Mon Sep 17 00:00:00 2001
From f9458e30c41213d315721183c9f10c3605812f57 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.
@@ -387,7 +387,7 @@ index 81e5f99..25ace13 100644
1.8.3.4
From da2d4b88e05f8291e5f190824537c72cb24a43e8 Mon Sep 17 00:00:00 2001
From 5d6dde9cb0022bdeee490b383ff1991eacc3b9cc 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.
@@ -439,7 +439,7 @@ index 0000000..a321e51
1.8.3.4
From 14526efbb024588a8e83a5010ff963ab67fc8c01 Mon Sep 17 00:00:00 2001
From f33151a4535dd22acaae24d4b16da3115b6cef64 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.
@@ -468,3 +468,79 @@ index b099b04..55bf194 100644
--
1.8.3.4
From 6fbbb6e99558e992f373cddd6ae02a3656ad7ce0 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.
* Adjust MakeMaker to automatically switch to vendor directories if
requested via HAIKU_USE_VENDOR_DIRECTORIES.
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
index 25ace13..0be8c3d 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
@@ -29,21 +29,20 @@ our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
our $VERSION = '6.66';
-=item os_flavor
-
-Haiku is Haiku.
-
-=cut
-
sub os_flavor {
return('Haiku');
}
-=head3 init_INSTALL_from_PREFIX
+sub init_main {
+ my $self = shift;
- $mm->init_INSTALL_from_PREFIX;
+ # switch to vendor directories if requested.
+ if ($ENV{'HAIKU_USE_VENDOR_DIRECTORIES'} eq '1') {
+ $self->{INSTALLDIRS} ||= 'vendor';
+ }
-=cut
+ $self->SUPER::init_main();
+}
sub init_INSTALL_from_PREFIX {
my $self = shift;
@@ -63,20 +62,6 @@ sub init_INSTALL_from_PREFIX {
}
}
-=back
-
-=head3 init_others
-
- $MM->init_others();
-
-Initializes the macro definitions having to do with compiling and
-linking used by tools_other() and places them in the $MM object.
-
-If there is no description, its the same as the parameter to
-WriteMakefile() documented in ExtUtils::MakeMaker.
-
-=cut
-
sub init_others {
my $self = shift;
@@ -90,8 +75,6 @@ sub init_others {
return;
}
-=back
-
1;
__END__
--
1.8.3.4