| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Do not use the _libxml_check_lib() on cross-compile |
| 2 | |
| 3 | Upstream-Status: Inappropriate [configuration] |
| 4 | |
| 5 | xml2 have been added into package's DEPENDS, so not need to use the |
| 6 | _libxml_check_lib() to check it again, and _libxml_check_lib() always |
| 7 | return false on cross-compile environment |
| 8 | |
| 9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 10 | --- |
| 11 | Makefile.PL | 52 ++++++++++++++++++++++++++-------------------------- |
| 12 | 1 file changed, 26 insertions(+), 26 deletions(-) |
| 13 | |
| 14 | diff --git a/Makefile.PL b/Makefile.PL |
| 15 | index c0485f1..09c676b 100644 |
| 16 | --- a/Makefile.PL |
| 17 | +++ b/Makefile.PL |
| 18 | @@ -411,32 +411,32 @@ sub _libxml_check_lib { |
| 19 | } |
| 20 | } |
| 21 | |
| 22 | -print "Checking for ability to link against xml2..."; |
| 23 | -if ( _libxml_check_lib('xml2') ) { |
| 24 | - print "yes\n"; |
| 25 | -} |
| 26 | -else { |
| 27 | - print "no\n"; |
| 28 | - print "Checking for ability to link against libxml2..."; |
| 29 | - if ( _libxml_check_lib('libxml2')) { |
| 30 | - print "yes\n"; |
| 31 | - } |
| 32 | - else { |
| 33 | - print STDERR <<"DEATH"; |
| 34 | -libxml2, zlib, and/or the Math library (-lm) have not been found. |
| 35 | -Try setting LIBS and INC values on the command line |
| 36 | -Or get libxml2 from |
| 37 | - http://xmlsoft.org/ |
| 38 | -If you install via RPMs, make sure you also install the -devel |
| 39 | -RPMs, as this is where the headers (.h files) are. |
| 40 | - |
| 41 | -Also, you may try to run perl Makefile.PL with the DEBUG=1 parameter |
| 42 | -to see the exact reason why the detection of libxml2 installation |
| 43 | -failed or why Makefile.PL was not able to compile a test program. |
| 44 | -DEATH |
| 45 | - exit 0; # 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors) |
| 46 | - } |
| 47 | -} |
| 48 | +#print "Checking for ability to link against xml2..."; |
| 49 | +#if ( _libxml_check_lib('xml2') ) { |
| 50 | +# print "yes\n"; |
| 51 | +#} |
| 52 | +#else { |
| 53 | +# print "no\n"; |
| 54 | +# print "Checking for ability to link against libxml2..."; |
| 55 | +# if ( _libxml_check_lib('libxml2')) { |
| 56 | +# print "yes\n"; |
| 57 | +# } |
| 58 | +# else { |
| 59 | +# print STDERR <<"DEATH"; |
| 60 | +#libxml2, zlib, and/or the Math library (-lm) have not been found. |
| 61 | +#Try setting LIBS and INC values on the command line |
| 62 | +#Or get libxml2 from |
| 63 | +# http://xmlsoft.org/ |
| 64 | +#If you install via RPMs, make sure you also install the -devel |
| 65 | +#RPMs, as this is where the headers (.h files) are. |
| 66 | +# |
| 67 | +#Also, you may try to run perl Makefile.PL with the DEBUG=1 parameter |
| 68 | +#to see the exact reason why the detection of libxml2 installation |
| 69 | +#failed or why Makefile.PL was not able to compile a test program. |
| 70 | +#DEATH |
| 71 | +# exit 0; # 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors) |
| 72 | +# } |
| 73 | +#} |
| 74 | |
| 75 | # -------------------------------------------------------------------------- # |
| 76 | # _NOW_ write the Makefile |
| 77 | -- |
| 78 | 1.7.10.4 |
| 79 | |