3 files changed, 0 insertions, 153 deletions
diff --git a/dev-cpp/glog/files/glog-0.4.0-errnos.patch b/dev-cpp/glog/files/glog-0.4.0-errnos.patch
deleted file mode 100644
index c55716db1ba2..000000000000
--- a/dev-cpp/glog/files/glog-0.4.0-errnos.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: b/src/googletest.h
-===================================================================
---- a/src/googletest.h
-+++ b/src/googletest.h
-@@ -437,6 +437,18 @@ static inline void StringReplace(string*
-   }
- }
- 
-+static inline void IntReplace(string* str,
-+                          const string& oldsub,
-+                          int newsub) {
-+  size_t pos = str->find(oldsub);
-+  if (pos != string::npos) {
-+    std::ostringstream ss;
-+    ss << newsub;
-+    const std::string x = ss.str();
-+    str->replace(pos, oldsub.size(), x.c_str());
-+  }
-+}
-+
- static inline string Munge(const string& filename) {
-   FILE* fp = fopen(filename.c_str(), "rb");
-   CHECK(fp != NULL) << filename << ": couldn't open";
-@@ -452,9 +464,13 @@ static inline string Munge(const string&
- 
-     StringReplace(&line, "__SUCCESS__", StrError(0));
-     StringReplace(&line, "__ENOENT__", StrError(ENOENT));
-+    IntReplace(&line, "__ENOENT_NUM__", ENOENT);
-     StringReplace(&line, "__EINTR__", StrError(EINTR));
-+    IntReplace(&line, "__EINTR_NUM__", EINTR);
-     StringReplace(&line, "__ENXIO__", StrError(ENXIO));
-+    IntReplace(&line, "__ENXIO_NUM__", ENXIO);
-     StringReplace(&line, "__ENOEXEC__", StrError(ENOEXEC));
-+    IntReplace(&line, "__ENOEXEC_NUM__", ENOEXEC);
-     result += line + "\n";
-   }
-   fclose(fp);
-Index: b/src/logging_unittest.cc
-===================================================================
---- a/src/logging_unittest.cc
-+++ b/src/logging_unittest.cc
-@@ -238,6 +238,17 @@ int main(int argc, char **argv) {
-   return 0;
- }
- 
-+static int errnoForIteration(int i) {
-+  switch (i) {
-+    case 0: return 0;
-+    case 2: return ENOENT;
-+    case 4: return EINTR;
-+    case 6: return ENXIO;
-+    case 8: return ENOEXEC;
-+  }
-+  return -1;
-+}
-+
- void TestLogging(bool check_counts) {
-   int64 base_num_infos   = LogMessage::num_messages(GLOG_INFO);
-   int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING);
-@@ -246,7 +257,7 @@ void TestLogging(bool check_counts) {
-   LOG(INFO) << string("foo ") << "bar " << 10 << ' ' << 3.4;
-   for ( int i = 0; i < 10; ++i ) {
-     int old_errno = errno;
--    errno = i;
-+    errno = errnoForIteration(i);
-     PLOG_EVERY_N(ERROR, 2) << "Plog every 2, iteration " << COUNTER;
-     errno = old_errno;
- 
-Index: b/src/logging_unittest.err
-===================================================================
---- a/src/logging_unittest.err
-+++ b/src/logging_unittest.err
-@@ -51,21 +51,21 @@ WDATE TIME__ THREADID logging_unittest.c
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 1
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 1
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 2
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [2]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [__ENOENT_NUM__]
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 3
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 3
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 4
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 4
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [4]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [__EINTR_NUM__]
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 5
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 5
- WDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 5, iteration 6
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 6
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [6]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [__ENXIO_NUM__]
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 7
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 7
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 8
--EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [8]
-+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [__ENOEXEC_NUM__]
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 9
- IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 9
- EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 10
-
diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch b/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch
deleted file mode 100644
index 392ae8ca7819..000000000000
--- a/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: google-glog-0.3.2/src/signalhandler_unittest.sh
-===================================================================
---- google-glog-0.3.2.orig/src/signalhandler_unittest.sh	2013-03-13 13:49:37.820188111 -0400
-+++ google-glog-0.3.2/src/signalhandler_unittest.sh	2013-03-13 14:07:11.980204520 -0400
-@@ -65,10 +65,10 @@
-   exit 0
- fi
- 
--# The PC cannot be obtained in signal handlers on PowerPC correctly.
--# We just skip the test for PowerPC.
--if [ x`uname -p` = x"powerpc" ]; then
--  echo "PASS (We don't test the signal handler on PowerPC.)"
-+# This test only works correctly on i386 and amd64.
-+# We just skip the test when not on those platforms.
-+if [ x`uname -m` != x"x86_64" -a x`uname -m` != x"i686" ]; then
-+  echo "PASS (We only test the signal handler on i386 or amd64.)"
-   exit 0
- fi
- 
diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch b/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch
deleted file mode 100644
index e53318ac66ff..000000000000
--- a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: fix FTBFS on x32
-Author: Guillaume Morin <guillaume@morinfr.org>
-Forwarded: no
-Last-Update: 2019-08-05
-
----
-
---- google-glog-0.3.4.orig/src/symbolize_unittest.cc
-+++ google-glog-0.3.4/src/symbolize_unittest.cc
-@@ -313,8 +313,12 @@ extern "C" {
- inline void* always_inline inline_func() {
-   void *pc = NULL;
- #ifdef TEST_X86_32_AND_64
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+  __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc));
-+#else
-   __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
- #endif
-+#endif
-   return pc;
- }
- 
-@@ -322,8 +326,12 @@ void* ATTRIBUTE_NOINLINE non_inline_func
- void* ATTRIBUTE_NOINLINE non_inline_func() {
-   void *pc = NULL;
- #ifdef TEST_X86_32_AND_64
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+  __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc));
-+#else
-   __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
- #endif
-+#endif
-   return pc;
- }
-