Merge branch 'master' of ssh://gparabola/abslibre-mips64el

3 files changed, 1 insertions, 78 deletions

diff --git a/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch b/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch
deleted file mode 100644
index 5fcbdc628..000000000
--- a/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-## mips_gcc4.4 by Werner Koch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build fails on mips(el) due to changes the removal 
-## DP: of the 'h' constraint for MIPS in gcc-4.4.x versions.
-## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-devel/2010-October/025805.html>
-
-diff -Nur gnupg-1.4.11.orig/mpi/longlong.h gnupg-1.4.11/mpi/longlong.h
---- gnupg-1.4.11.orig/mpi/longlong.h	2010-06-01 13:01:46.000000000 +0200
-+++ gnupg-1.4.11/mpi/longlong.h	2010-10-28 22:01:19.000000000 +0200
-@@ -710,12 +710,13 @@
-  **************  MIPS  *****************
-  ***************************************/
- #if defined (__mips__) && W_TYPE_SIZE == 32
--#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 )
--#define umul_ppmm(w1, w0, u, v)                                         \
-+#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
-   do {                                                                  \
--    UDItype __ll = (UDItype)(u) * (v);                                  \
--    w1 = __ll >> 32;                                                    \
--    w0 = __ll;                                                          \
-+    UDItype _r;                                                         \
-+    _r = (UDItype) u * v;                                               \
-+    (w1) = _r >> 32;                                                    \
-+    (w0) = (USItype) _r;                                                \
-   } while (0)
- #elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v)                                         \
-@@ -742,7 +743,16 @@
-  **************  MIPS/64  **************
-  ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+   typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+ #  define umul_ppmm(w1, w0, u, v)                                       \
-+  do {                                                                  \
-+    UTItype _r;                                                         \
-+    _r = (UTItype) u * v;                                               \
-+    (w1) = _r >> 64;                                                    \
-+    (w0) = (UDItype) _r;                                                \
-+  } while (0)
-+# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3"                                               \
- 	   : "=l" ((UDItype)(w0)),                                      \
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 0d29f8ebe..68fb9962e 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -31,7 +31,7 @@ build() {
   cd "${srcdir}"/${_pkgfqn}
 
   # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
-  patch -Np1 -i "{$srcdir}/declarative-fix-sigbus.patch"
+  patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
   # (FS#27757)
   patch -p1 -i "${srcdir}"/fix-qurl.patch
 
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
deleted file mode 100644
index fa400b953..000000000
--- a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
---- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
-+++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,17 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.15)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
-+$as_echo "2.15 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      darwin)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-@@ -6422,7 +6433,7 @@
-      *)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
--	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
- 	as_fn_error "or Darwin libc" "$LINENO" 5
- 	;;
- esac