Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
This commit is contained in:
Tobias Geerinckx-Rice
@@ -1,39 +0,0 @@
|
||||
diff --git a/src/configure.in b/src/configure.in
|
||||
index 434da49..642c66c 100644
|
||||
--- ecl-15.3.7.orig/src/configure.ac
|
||||
+++ ecl-15.3.7/src/configure.ac
|
||||
@@ -191,6 +191,11 @@ AC_ARG_WITH(dffi,
|
||||
[(system|included|auto|no, default=AUTO if libffi available)]),
|
||||
[enable_libffi=${withval}], [enable_libffi=auto])
|
||||
|
||||
+AC_ARG_WITH(libffi-prefix,
|
||||
+ AS_HELP_STRING( [--with-libffi-prefix=path],
|
||||
+ [prefix for system LIBFFI includes and libraries] ),
|
||||
+ [LIBFFI_INCDIR="$withval/include"; LIBFFI_LIBDIR="$withval/lib"], [])
|
||||
+
|
||||
AC_ARG_WITH(fpe,
|
||||
AS_HELP_STRING( [--with-fpe],
|
||||
[detect floating point exceptions]
|
||||
@@ -368,6 +373,22 @@ else
|
||||
INFOEXT=info
|
||||
fi
|
||||
|
||||
+dnl libffi
|
||||
+
|
||||
+if test "x$LIBFFI_INCDIR" != "x"; then
|
||||
+ LIBFFI_CPPFLAGS="-I$LIBFFI_INCDIR"
|
||||
+fi
|
||||
+if test "x$LIBFFI_LIBDIR" != "x"; then
|
||||
+ LIBFFI_LDFLAGS="-L$LIBFFI_LIBDIR"
|
||||
+ if test "$enable_rpath" = "yes"; then
|
||||
+ if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then
|
||||
+ LIBFFI_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBFFI_LIBDIR,"`" $LIBFFI_LDFLAGS"
|
||||
+ fi
|
||||
+ fi
|
||||
+fi
|
||||
+CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS"
|
||||
+LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS"
|
||||
+
|
||||
dnl ======================================================================
|
||||
dnl GNU multiprecision library
|
||||
dnl
|
||||
@@ -1,60 +0,0 @@
|
||||
diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs
|
||||
--- a/compiler/ghci/Linker.hs
|
||||
+++ b/compiler/ghci/Linker.hs
|
||||
@@ -119,9 +119,9 @@
|
||||
-- that is really important
|
||||
pkgs_loaded :: ![PackageKey],
|
||||
|
||||
- -- we need to remember the name of the last temporary DLL/.so
|
||||
- -- so we can link it
|
||||
- last_temp_so :: !(Maybe (FilePath, String)) }
|
||||
+ -- we need to remember the name of previous temporary DLL/.so
|
||||
+ -- libraries so we can link them (see #10322)
|
||||
+ temp_sos :: ![(FilePath, String)] }
|
||||
|
||||
|
||||
emptyPLS :: DynFlags -> PersistentLinkerState
|
||||
@@ -131,7 +131,7 @@
|
||||
pkgs_loaded = init_pkgs,
|
||||
bcos_loaded = [],
|
||||
objs_loaded = [],
|
||||
- last_temp_so = Nothing }
|
||||
+ temp_sos = [] }
|
||||
|
||||
-- Packages that don't need loading, because the compiler
|
||||
-- shares them with the interpreted program.
|
||||
@@ -841,19 +841,19 @@
|
||||
dflags2 = dflags1 {
|
||||
-- We don't want the original ldInputs in
|
||||
-- (they're already linked in), but we do want
|
||||
- -- to link against the previous dynLoadObjs
|
||||
- -- library if there was one, so that the linker
|
||||
+ -- to link against previous dynLoadObjs
|
||||
+ -- libraries if there were any, so that the linker
|
||||
-- can resolve dependencies when it loads this
|
||||
-- library.
|
||||
ldInputs =
|
||||
- case last_temp_so pls of
|
||||
- Nothing -> []
|
||||
- Just (lp, l) ->
|
||||
+ concatMap
|
||||
+ (\(lp, l) ->
|
||||
[ Option ("-L" ++ lp)
|
||||
, Option ("-Wl,-rpath")
|
||||
, Option ("-Wl," ++ lp)
|
||||
, Option ("-l" ++ l)
|
||||
- ],
|
||||
+ ])
|
||||
+ (temp_sos pls),
|
||||
-- Even if we're e.g. profiling, we still want
|
||||
-- the vanilla dynamic libraries, so we set the
|
||||
-- ways / build tag to be just WayDyn.
|
||||
@@ -868,7 +868,7 @@
|
||||
consIORef (filesToNotIntermediateClean dflags) soFile
|
||||
m <- loadDLL soFile
|
||||
case m of
|
||||
- Nothing -> return pls { last_temp_so = Just (libPath, libName) }
|
||||
+ Nothing -> return pls { temp_sos = (libPath, libName) : temp_sos pls }
|
||||
Just err -> panic ("Loading temp shared object failed: " ++ err)
|
||||
|
||||
rmDupLinkables :: [Linkable] -- Already loaded
|
||||
@@ -1,40 +0,0 @@
|
||||
From 3918a2ccceb98230ff517601ad60aa6bee36e2c4 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Malyshev <alexanderm@fb.com>
|
||||
Date: Tue, 28 Oct 2014 15:55:34 -0700
|
||||
Subject: [PATCH] Replace use of MAX macro with std::max in ZendPack
|
||||
|
||||
Summary: This has randomly bitten me in open source builds. I intermittently get
|
||||
an error saying that MAX isn't defined.
|
||||
|
||||
Instead of trying to figure out what's going on, I'm just gonna switch
|
||||
it to std::max.
|
||||
|
||||
Reviewed By: @paulbiss
|
||||
|
||||
Differential Revision: D1636740
|
||||
---
|
||||
hphp/runtime/base/zend-pack.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp
|
||||
index d878ea4..c3ee14d 100644
|
||||
--- a/hphp/runtime/base/zend-pack.cpp
|
||||
+++ b/hphp/runtime/base/zend-pack.cpp
|
||||
@@ -21,6 +21,8 @@
|
||||
#include "hphp/runtime/base/builtin-functions.h"
|
||||
#include "hphp/util/tiny-vector.h"
|
||||
|
||||
+#include <algorithm>
|
||||
+
|
||||
namespace HPHP {
|
||||
|
||||
#define INC_OUTPUTPOS(a,b) \
|
||||
@@ -294,7 +296,7 @@ Variant ZendPack::pack(const String& fmt, const Array& argv) {
|
||||
case 'a':
|
||||
case 'A':
|
||||
case 'Z': {
|
||||
- int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1);
|
||||
+ int arg_cp = (code != 'Z') ? arg : std::max(0, arg - 1);
|
||||
memset(&output[outputpos], (code != 'A') ? '\0' : ' ', arg);
|
||||
val = argv[currentarg++].toString();
|
||||
s = val.c_str();
|
||||
@@ -1,40 +0,0 @@
|
||||
From 8207a31c26cc42fee79363a14c4a8f4fcbfffe63 Mon Sep 17 00:00:00 2001
|
||||
From: Jordan DeLong <jdelong@fb.com>
|
||||
Date: Mon, 6 Oct 2014 18:30:28 -0700
|
||||
Subject: [PATCH] Remove some MIN/MAX macro uses in the emitter
|
||||
|
||||
Summary: <algorithm> has preferable type-safe versions that don't double-eval
|
||||
their args.
|
||||
|
||||
Reviewed By: @paulbiss
|
||||
|
||||
Differential Revision: D1599803
|
||||
---
|
||||
hphp/compiler/analysis/emitter.cpp | 6 +++---
|
||||
hphp/util/compatibility.h | 4 ----
|
||||
2 files changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp
|
||||
index 321e637..b1d3f2d 100644
|
||||
--- a/hphp/compiler/analysis/emitter.cpp
|
||||
+++ b/hphp/compiler/analysis/emitter.cpp
|
||||
@@ -799,8 +799,8 @@ void SymbolicStack::push(char sym) {
|
||||
if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L &&
|
||||
sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) {
|
||||
m_actualStack.push_back(m_symStack.size());
|
||||
- *m_actualStackHighWaterPtr = MAX(*m_actualStackHighWaterPtr,
|
||||
- (int)m_actualStack.size());
|
||||
+ *m_actualStackHighWaterPtr = std::max(*m_actualStackHighWaterPtr,
|
||||
+ (int)m_actualStack.size());
|
||||
}
|
||||
m_symStack.push_back(SymEntry(sym));
|
||||
}
|
||||
@@ -1010,7 +1010,7 @@ int SymbolicStack::sizeActual() const {
|
||||
|
||||
void SymbolicStack::pushFDesc() {
|
||||
m_fdescCount += kNumActRecCells;
|
||||
- *m_fdescHighWaterPtr = MAX(*m_fdescHighWaterPtr, m_fdescCount);
|
||||
+ *m_fdescHighWaterPtr = std::max(*m_fdescHighWaterPtr, m_fdescCount);
|
||||
}
|
||||
|
||||
void SymbolicStack::popFDesc() {
|
||||
@@ -1,24 +0,0 @@
|
||||
From b9070aeab0ab672ffe321089631f9afe263b0caa Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Thu, 4 Jun 2015 12:03:32 -0500
|
||||
Subject: [PATCH] work around buggy wcwidth
|
||||
|
||||
---
|
||||
test/unicode.jl | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/unicode.jl b/test/unicode.jl
|
||||
index 52c3e6a..f1ef698 100644
|
||||
--- a/test/unicode.jl
|
||||
+++ b/test/unicode.jl
|
||||
@@ -103,5 +103,6 @@ end
|
||||
|
||||
# handling of embedded NUL chars (#10958)
|
||||
@test length("\0w") == length("\0α") == 2
|
||||
-@test strwidth("\0w") == strwidth("\0α") == 1
|
||||
+@test strwidth("\0w") == charwidth('\0') + charwidth('w')
|
||||
+@test strwidth("\0α") == charwidth('\0') + charwidth('α')
|
||||
@test normalize_string("\0W", casefold=true) == "\0w"
|
||||
--
|
||||
2.4.1
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Naur openjdk-7u65-b32/hotspot/make/linux/Makefile openjdk-7u65-b32-patch/hotspot/make/linux/Makefile
|
||||
--- openjdk-7u65-b32/hotspot/make/linux/Makefile 2014-07-17 03:08:38.000000000 -0700
|
||||
+++ openjdk-7u65-b32-patch/hotspot/make/linux/Makefile 2015-04-21 05:33:12.170190385 -0700
|
||||
@@ -231,7 +231,7 @@
|
||||
# Solaris 2.5.1, 2.6).
|
||||
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
|
||||
|
||||
-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
|
||||
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
|
||||
OS_VERSION := $(shell uname -r)
|
||||
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
|
||||
|
||||
Reference in New Issue
Block a user