From 77bb08219e35f2afd505dbb85cf332ab0723dcf6 Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Tue, 29 Jan 2013 01:37:37 -0700 Subject: [PATCH] cflags and libs can now return a list of flags --- examples/01-compile.t | 10 ++++----- lib/Alien/ZMQ.pm | 49 +++++++++++++++++++++++++++---------------- t/00-basic.t | 13 +++++++----- 3 files changed, 44 insertions(+), 28 deletions(-) diff --git a/examples/01-compile.t b/examples/01-compile.t index ffde85d..83940ef 100644 --- a/examples/01-compile.t +++ b/examples/01-compile.t @@ -37,25 +37,25 @@ END close $SRC; my $obj = eval { - $cb->compile(source => $src, extra_compiler_flags => Alien::ZMQ::cflags); + $cb->compile(source => $src, extra_compiler_flags => [Alien::ZMQ->cflags]); }; unlink $src; ok($obj, "compile C code"); BAIL_OUT("compile failed") unless $obj; my $exe = eval { - $cb->link_executable(objects => $obj, extra_linker_flags => Alien::ZMQ::libs); + $cb->link_executable(objects => $obj, extra_linker_flags => [Alien::ZMQ->libs]); }; unlink $obj; ok($exe, "link object"); BAIL_OUT("link failed") unless $exe; -$ENV{LD_LIBRARY_PATH} = Alien::ZMQ::lib_dir; +$ENV{LD_LIBRARY_PATH} = Alien::ZMQ->lib_dir; my $out = `./$exe`; ok($out, "run executable"); unlink $exe; my ($inc_version, $lib_version) = $out =~ /(\d\.\d\.\d) (\d\.\d\.\d)/; -ok(version->parse($inc_version) == Alien::ZMQ::inc_version, "include versions are equal"); -ok(version->parse($lib_version) == Alien::ZMQ::lib_version, "library versions are equal"); +cmp_ok(version->parse($inc_version), '==', Alien::ZMQ->inc_version, "include versions are equal"); +cmp_ok(version->parse($lib_version), '==', Alien::ZMQ->lib_version, "library versions are equal"); diff --git a/lib/Alien/ZMQ.pm b/lib/Alien/ZMQ.pm index 7351fb6..3990b86 100644 --- a/lib/Alien/ZMQ.pm +++ b/lib/Alien/ZMQ.pm @@ -44,19 +44,19 @@ be on the system. Use this to skip those checks and always install libzmq. Pass extra flags to the compiler when probing for an existing installation of libzmq. You can use this, along with L, to help the probing -function locate your libzmq installation if it is installed in an unexpected -place. For example, if your libzmq is installed at F, you can do -something like this: +function locate libzmq if it is installed in an unexpected place. For +example, if your libzmq is installed at F, you can do something +like this: - perl ./Build.PL --zmq-cflags="-I/opt/zeromq/include" \ - --zmq-libs="-L/opt/zeromq/lib -lzmq" + perl Build.PL --zmq-cflags="-I/opt/zeromq/include" \ + --zmq-libs="-L/opt/zeromq/lib -lzmq" These flags are only used by the probing function to locate libzmq; they will not be used when compiling libzmq from source (if it needs to be). To affect the compiling of libzmq, using the L flag instead. A better alternative to using L and L is to help -the L command find your libzmq using the C +the L program find your libzmq by using the C environment variable. Of course, this method requires that you have the L program installed. Here's an example: @@ -67,9 +67,9 @@ L program installed. Here's an example: Pass extra flags to the linker when probing for an existing installation of libzmq. You can use this, along with L, to help the probing -function locate your libzmq installation if it is installed in an unexpected -place. Like L, these flags are only used by the probing -function to locate libzmq. +function locate libzmq if it is installed in an unexpected place. Like +L, these flags are only used by the probing function to locate +libzmq. =item --zmq-config @@ -144,31 +144,44 @@ sub lib_dir { } =method cflags Get the C compiler flags required to compile a program that uses libzmq. This -is a shortcut for constructing a C<-I> flag using L. +is a shortcut for constructing a C<-I> flag using L. In scalar +context, the flags are quoted using L and returned as +a single string. =cut sub cflags { - "-I" . shell_quote(inc_dir); + if (wantarray) { + "-I" . inc_dir; + } else { + "-I" . shell_quote(inc_dir); + } } =method libs Get the linker flags required to link a program against libzmq. This is -a shortcut for constructing a C<-L> flag using L, plus C<-lzmq>. On -some platforms, you may also want to add the library path to your executable -or library as a runtime path; this can be done by passing C<-rpath> to the -linker. Something like this could work: +a shortcut for constructing a C<-L> flag using L, plus C<-lzmq>. In +scalar context, the flags are quoted using L and returned +as a single string. - my $mylibs = Alien::ZMQ::libs . " -Wl,-rpath=" . Alien::ZMQ::lib_dir; +On some platforms, you may also want to add the library path to your +executable or library as a runtime path; this is usually done by passing +C<-rpath> to the linker. Something like this could work: + + my @flags = (Alien::ZMQ::libs, "-Wl,-rpath=" . Alien::ZMQ::lib_dir); This will allow your program to find libzmq, even if it is installed in -a non-standard location, but this isn't necessary on some platforms. +a non-standard location, but some systems don't have this C mechanism. =cut sub libs { - "-L" . shell_quote(lib_dir) . " -lzmq"; + if (wantarray) { + "-L" . lib_dir, "-lzmq"; + } else { + "-L" . shell_quote(lib_dir) . " -lzmq"; + } } 1; diff --git a/t/00-basic.t b/t/00-basic.t index f819d60..bb257ea 100644 --- a/t/00-basic.t +++ b/t/00-basic.t @@ -1,9 +1,9 @@ #!perl -use warnings; +use warnings FATAL => 'all'; use strict; -use Test::More tests => 8; +use Test::More tests => 11; BEGIN { use_ok 'Alien::ZMQ'; @@ -14,7 +14,10 @@ ok Alien::ZMQ::lib_version, "library version number"; ok Alien::ZMQ::inc_dir, "include directory path"; ok Alien::ZMQ::inc_dir, "library directory path"; -like Alien::ZMQ::cflags, qr/-I\S+/, "cflags has -I"; -like Alien::ZMQ::libs, qr/-L\S+/, "libs has -L"; -like Alien::ZMQ::libs, qr/-lzmq/, "libs has -lzmq"; +ok grep(/-I\S+/, Alien::ZMQ::cflags), "cflags array has -I"; +ok grep(/-L\S+/, Alien::ZMQ::libs), "libs array has -L"; +ok grep(/-lzmq/, Alien::ZMQ::libs), "libs array has -lzmq"; +like Alien::ZMQ::cflags, qr/-I\S+/, "cflags string has -I"; +like Alien::ZMQ::libs, qr/-L\S+/, "libs string has -L"; +like Alien::ZMQ::libs, qr/-lzmq/, "libs string has -lzmq"; -- 2.45.2