diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-05 14:29:58 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:04:11 -0700 |
| commit | 37c8700560b6da569cdf9d7c306a9aa31dcdf06f (patch) | |
| tree | fc8d85613c2168d51e3ea00f69035677a0c7ebce /meta/recipes-devtools/apt/apt/disable-test.patch | |
| parent | 82d85bdee7707896cbd432b143eb0ac22c8e3451 (diff) | |
| download | openembedded-core-contrib-37c8700560b6da569cdf9d7c306a9aa31dcdf06f.tar.gz | |
apt: update to 1.0.10.1
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/disable-test.patch')
| -rw-r--r-- | meta/recipes-devtools/apt/apt/disable-test.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/disable-test.patch b/meta/recipes-devtools/apt/apt/disable-test.patch new file mode 100644 index 0000000000..676795dc8a --- /dev/null +++ b/meta/recipes-devtools/apt/apt/disable-test.patch @@ -0,0 +1,58 @@ +[PATCH] disable test + +Upstream-Status: Inappropriate [configuration] + +test needs gtest package, so not build the test dir + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + Makefile | 7 +++---- + configure.ac | 6 ------ + 2 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 5f5fb27..5070e96 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,8 +9,8 @@ endif + .PHONY: default + default: startup all + +-.PHONY: headers library clean veryclean all binary program doc test update-po +-all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs: ++.PHONY: headers library clean veryclean all binary program doc update-po ++all headers library clean veryclean binary program doc manpages docbook update-po startup dirs: + $(MAKE) -C vendor $@ + $(MAKE) -C apt-pkg $@ + $(MAKE) -C apt-inst $@ +@@ -21,9 +21,8 @@ all headers library clean veryclean binary program doc manpages docbook test upd + $(MAKE) -C dselect $@ + # $(MAKE) -C doc $@ + $(MAKE) -C po $@ +- $(MAKE) -C test $@ + +-all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs ++all headers library clean veryclean binary program doc manpages docbook update-po: startup dirs + + dirs: startup + +diff --git a/configure.ac b/configure.ac +index 5663aaf..b0f9564 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,12 +89,6 @@ AC_CHECK_LIB(curl, curl_easy_init, + AC_MSG_ERROR([failed: I need CURL due https support]), + ) + +-AC_LANG_PUSH([C++]) +-AC_CHECK_HEADER(gtest/gtest.h,, +- AC_MSG_ERROR([failed: I need gtest to build tests]), +-) +-AC_LANG_POP([C++]) +- + + AC_SUBST(BDBLIB) + +-- +1.9.1 + |