1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Description: Use packaged msgpack
Remove from builder/MyBuilder.pm the code to build the msgpack source code
included in the upstream source. Link to the binary from the libmsgpack
package instead.
Forwarded: not-needed
Author: Christopher Hoskin <christopher.hoskin@gmail.com>
Reviewed-by: gregor herrmann <gregoa@debian.org>
Last-Update: 2021-11-07
--- a/builder/MyBuilder.pm
+++ b/builder/MyBuilder.pm
@@ -4,57 +4,20 @@
use base 'Module::Build::XSUtil';
use File::Spec::Functions qw(catfile catdir);
-use File::Which qw(which);
use Config;
my $MSGPACK_VERSION = '3.3.0';
-__PACKAGE__->add_property(_cmake => undef);
-
sub new {
my ($class, %argv) = @_;
- my $cmake = which 'cmake';
- if (!$cmake) {
- die "Need 'cmake' command for building Data::MessagePack::Stream\n";
- }
my $self = $class->SUPER::new(
%argv,
- include_dirs => [catdir("msgpack-$MSGPACK_VERSION", 'include')],
+ extra_linker_flags => ['-lmsgpackc'],
generate_ppport_h => catfile('lib', 'Data', 'MessagePack', 'ppport.h'),
cc_warnings => 1,
);
- $self->_cmake($cmake);
$self;
}
-sub _build_msgpack {
- my $self = shift;
-
- my @opt = qw(
- -DMSGPACK_ENABLE_SHARED=OFF
- -DMSGPACK_ENABLE_CXX=OFF
- -DMSGPACK_BUILD_EXAMPLES=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- );
- chdir "msgpack-$MSGPACK_VERSION";
- my $ok = $self->do_system($self->_cmake, @opt, ".");
- $ok &&= $self->do_system($Config{make});
- chdir "..";
- $ok;
-}
-
-sub ACTION_code {
- my ($self, @argv) = @_;
-
- my $spec = $self->_infer_xs_spec(catfile("lib", "Data", "MessagePack", "Stream.xs"));
- my $archive = catfile("msgpack-$MSGPACK_VERSION", "libmsgpackc.a");
- if (!$self->up_to_date($archive, $spec->{lib_file})) {
- $self->_build_msgpack or die;
- push @{$self->{properties}{objects}}, $archive; # XXX
- }
-
- $self->SUPER::ACTION_code(@argv);
-}
-
1;
|
