diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2017-08-20 08:29:50 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2017-08-20 08:29:50 +0300 |
commit | 9c20dbb9f4494b91eef2d40483b5a88b91b35f7e (patch) | |
tree | 5f0b18e506f23c2d779331e5f9f2ffb3aa48679d | |
parent | 78a1be8e1e947ada60a1e3b458dbde0d7a400a98 (diff) | |
download | posixruncapture-9c20dbb9f4494b91eef2d40483b5a88b91b35f7e.tar.gz posixruncapture-9c20dbb9f4494b91eef2d40483b5a88b91b35f7e.tar.bz2 |
Update runcap
-rw-r--r-- | MANIFEST | 4 | ||||
-rw-r--r-- | Makefile.PL | 23 | ||||
-rw-r--r-- | lib/POSIX/Run/Capture.pm | 4 | ||||
m--------- | runcap | 0 |
4 files changed, 20 insertions, 11 deletions
@@ -18,7 +18,9 @@ t/06lines.t t/07two.t t/08input.t t/TestCapture.pm -runcap/Makefile +runcap/Makefile.am +runcap/configure.ac +runcap/configure runcap/runcap.h runcap/runcap.c runcap/getc.c diff --git a/Makefile.PL b/Makefile.PL index 29aa661..4aee252 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -15,8 +15,8 @@ WriteMakefile( LIBS => [''], # e.g., '-lm' DEFINE => '', INC => '-I.', # e.g., '-I. -I/usr/include/other' - OBJECT => '$(O_FILES) runcap/libruncap.a', - DIR => [ 'runcap' ], + OBJECT => '$(O_FILES)', + MYEXTLIB => 'runcap/libruncap.a', META_MERGE => { 'meta-spec' => { version => 2 }, resources => { @@ -33,12 +33,6 @@ WriteMakefile( package MY; -sub pasthru { - my $val = shift->SUPER::pasthru(@_); - chomp($val); - return $val . "\\\n O='\$(CCFLAGS)'"; -} - sub test { my $val = shift->SUPER::test(@_); open(my $fd, '<', \$val); @@ -71,3 +65,16 @@ sub test { return join("\n", @ret); } + +sub postamble { +' +$(MYEXTLIB): runcap/configure + cd runcap && \ + ./configure CFLAGS="$(CCFLAGS) $(CCCDLFLAGS)" && \ + $(MAKE) + +runcap/configure: runcap/configure.ac + RUNCAP_BUILD=static autoreconf -f -i -s -I. runcap +' +} + diff --git a/lib/POSIX/Run/Capture.pm b/lib/POSIX/Run/Capture.pm index 5dedad0..aa9825a 100644 --- a/lib/POSIX/Run/Capture.pm +++ b/lib/POSIX/Run/Capture.pm @@ -86,8 +86,8 @@ POSIX::Run::Capture - run command and capture its output $obj->set_timeout($n); $obj->set_input($fh_or_string); - $aref = head3 $obj->argv; - $str = =head3 $obj->program + $aref = $obj->argv; + $str = $obj->program $num = $obj->timeout; =head1 DESCRIPTION diff --git a/runcap b/runcap -Subproject 3f686a2e5768174553b39697576171f5862433e +Subproject 80134405a63517bda8964f7993d096dc1df247c |