From 17f20eabcab0e7e6f07d12e35e777f8b9abcda23 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Tue, 8 Dec 2015 07:29:55 +0100
Subject: glibc: move env/flags back to Makefile, fix cross-compile on MacOS X

---
 toolchain/glibc/patches/2.22/glibc-cross.patch | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'toolchain/glibc/patches/2.22')

diff --git a/toolchain/glibc/patches/2.22/glibc-cross.patch b/toolchain/glibc/patches/2.22/glibc-cross.patch
index e29af8dc3..c38ea8a3c 100644
--- a/toolchain/glibc/patches/2.22/glibc-cross.patch
+++ b/toolchain/glibc/patches/2.22/glibc-cross.patch
@@ -1,6 +1,6 @@
 diff -Nur glibc-2.22.orig/sunrpc/rpc_main.c glibc-2.22/sunrpc/rpc_main.c
 --- glibc-2.22.orig/sunrpc/rpc_main.c	2015-08-05 08:42:21.000000000 +0200
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-08-19 02:37:42.912687500 +0200
++++ glibc-2.22/sunrpc/rpc_main.c	2015-12-08 06:21:38.000000000 +0100
 @@ -38,7 +38,11 @@
  #include <stdio.h>
  #include <string.h>
@@ -24,3 +24,18 @@ diff -Nur glibc-2.22.orig/sunrpc/rpc_main.c glibc-2.22/sunrpc/rpc_main.c
  #include "../version.h"
  #define PACKAGE _libc_intl_domainname
  
+diff -Nur glibc-2.22.orig/sunrpc/rpc_scan.c glibc-2.22/sunrpc/rpc_scan.c
+--- glibc-2.22.orig/sunrpc/rpc_scan.c	2015-08-05 08:42:21.000000000 +0200
++++ glibc-2.22/sunrpc/rpc_scan.c	2015-12-08 06:22:36.000000000 +0100
+@@ -37,7 +37,11 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
++#if defined(__APPLE__) || defined(__CYGWIN__)
++#define gettext(X) (X)
++#else
+ #include <libintl.h>
++#endif
+ #include "rpc_scan.h"
+ #include "rpc_parse.h"
+ #include "rpc_util.h"
-- 
cgit v1.2.3