diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch')
-rw-r--r-- | meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch new file mode 100644 index 000000000..a8e7cc1bb --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch @@ -0,0 +1,79 @@ +Do not use the _libxml_check_lib() on cross-compile + +Upstream-Status: Inappropriate [configuration] + +xml2 have been added into package's DEPENDS, so not need to use the +_libxml_check_lib() to check it again, and _libxml_check_lib() always +return false on cross-compile environment + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + Makefile.PL | 52 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 26 insertions(+), 26 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index c0485f1..09c676b 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -411,32 +411,32 @@ sub _libxml_check_lib { + } + } + +-print "Checking for ability to link against xml2..."; +-if ( _libxml_check_lib('xml2') ) { +- print "yes\n"; +-} +-else { +- print "no\n"; +- print "Checking for ability to link against libxml2..."; +- if ( _libxml_check_lib('libxml2')) { +- print "yes\n"; +- } +- else { +- print STDERR <<"DEATH"; +-libxml2, zlib, and/or the Math library (-lm) have not been found. +-Try setting LIBS and INC values on the command line +-Or get libxml2 from +- http://xmlsoft.org/ +-If you install via RPMs, make sure you also install the -devel +-RPMs, as this is where the headers (.h files) are. +- +-Also, you may try to run perl Makefile.PL with the DEBUG=1 parameter +-to see the exact reason why the detection of libxml2 installation +-failed or why Makefile.PL was not able to compile a test program. +-DEATH +- exit 0; # 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors) +- } +-} ++#print "Checking for ability to link against xml2..."; ++#if ( _libxml_check_lib('xml2') ) { ++# print "yes\n"; ++#} ++#else { ++# print "no\n"; ++# print "Checking for ability to link against libxml2..."; ++# if ( _libxml_check_lib('libxml2')) { ++# print "yes\n"; ++# } ++# else { ++# print STDERR <<"DEATH"; ++#libxml2, zlib, and/or the Math library (-lm) have not been found. ++#Try setting LIBS and INC values on the command line ++#Or get libxml2 from ++# http://xmlsoft.org/ ++#If you install via RPMs, make sure you also install the -devel ++#RPMs, as this is where the headers (.h files) are. ++# ++#Also, you may try to run perl Makefile.PL with the DEBUG=1 parameter ++#to see the exact reason why the detection of libxml2 installation ++#failed or why Makefile.PL was not able to compile a test program. ++#DEATH ++# exit 0; # 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors) ++# } ++#} + + # -------------------------------------------------------------------------- # + # _NOW_ write the Makefile +-- +1.7.10.4 + |