Use a maximum fuzz factor of 1 for our patches to 3rd-party code
Change-Id: Id4639f1b0eefe5d433c84f48b7a1093fa17a3ba4
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- misc/boost_1_44_0/boost/function/function_base.hpp
|
||||
+++ misc/build/boost_1_44_0/boost/function/function_base.hpp
|
||||
@@ -314,15 +322,15 @@
|
||||
@@ -314,17 +322,17 @@
|
||||
{
|
||||
if (op == clone_functor_tag || op == move_functor_tag) {
|
||||
const functor_type* in_functor =
|
||||
|
@@ -1,8 +1,8 @@
|
||||
--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
|
||||
+++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
|
||||
@@ -56,6 +56,13 @@
|
||||
} // namespace detail
|
||||
|
||||
} // namespace detail
|
||||
|
||||
+// MSVC 2008 produces 2 warnings "default constructor could not be generated"
|
||||
+// here that run over ~100 lines :(
|
||||
|
@@ -40,7 +40,7 @@
|
||||
+++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100
|
||||
@@ -31,6 +31,8 @@
|
||||
|
||||
#include "boost/optional/optional_fwd.hpp"
|
||||
#include <boost/optional/optional_fwd.hpp>
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
|
@@ -272,8 +272,8 @@
|
||||
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000
|
||||
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000
|
||||
@@ -1608,4 +1608,16 @@
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
*/
|
||||
//#endif JAVA6
|
||||
+
|
||||
+//#ifdef JAVA7
|
||||
|
@@ -6,9 +6,9 @@
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
#include <vector>
|
||||
|
||||
#include "affixmgr.hxx"
|
||||
#include "affentry.hxx"
|
||||
#include "langnum.hxx"
|
||||
@@ -4000,7 +4002,10 @@
|
||||
case 3: {
|
||||
np++;
|
||||
|
@@ -13,7 +13,7 @@
|
||||
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200
|
||||
@@ -39,8 +39,12 @@
|
||||
|
||||
DEFAULT_COMPILER = cc
|
||||
DEFAULT_COMPILER = gcc
|
||||
|
||||
-CC = gcc
|
||||
-CCC = g++
|
||||
@@ -88,8 +88,8 @@
|
||||
|
||||
# INCLUDES += -I/usr/include -Y/usr/include/linux
|
||||
@@ -158,8 +161,13 @@
|
||||
#
|
||||
CPU_TAG = _$(CPU_ARCH)
|
||||
endif
|
||||
endif
|
||||
|
||||
+ifeq ($(SYSTEM_ZLIB),YES)
|
||||
+# Currently (3.12.4) only the tools modutil and signtool are linked with libz
|
||||
|
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
|
||||
for p in $(UNPACKED_PATCHES); do \
|
||||
pl=$(UNPACKED_PATCHLEVEL); \
|
||||
s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \
|
||||
$(GNUPATCH) -f -s "-p$$pl" < "$$p"; \
|
||||
$(GNUPATCH) -f -s "-p$$pl" --fuzz=1 < "$$p"; \
|
||||
if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\
|
||||
done && \
|
||||
) \
|
||||
|
Reference in New Issue
Block a user