Advertisement
class101

stdio_lim

Feb 18th, 2014
202
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.26 KB | None | 0 0
  1. diff -durN scripts/build/libc/glibc-eglibc.sh-common scripts/build/libc/glibc-eglibc.sh-common
  2. --- scripts/build/libc/glibc-eglibc.sh-common   2014-02-18 23:44:16.560044600 +0100
  3. +++ scripts/build/libc/glibc-eglibc.sh-common   2014-02-18 23:48:58.552110700 +0100
  4. @@ -472,6 +472,7 @@
  5.  
  6.          # use the 'install-headers' makefile target to install the
  7.          # headers
  8. +        MSYS2_ARG_CONV_EXCL="-DNLSPATH=;-DLOCALEDIR=;-DLOCALE_ALIAS_PATH="        \
  9.          CT_DoExecLog ALL make ${JOBSFLAGS}                                        \
  10.                           install_root="${install_root}"                           \
  11.                           install-bootstrap-headers=yes                            \
  12. @@ -523,6 +524,7 @@
  13.              # there are a few object files needed to link shared libraries,
  14.              # which we build and install by hand
  15.              CT_DoExecLog ALL mkdir -p "${extraos_dir}"
  16. +            MSYS2_ARG_CONV_EXCL="-DNLSPATH=;-DLOCALEDIR=;-DLOCALE_ALIAS_PATH=" \
  17.              CT_DoExecLog ALL make ${JOBSFLAGS}  \
  18.                          "${extra_make_args[@]}" \
  19.                          csu/subdir_lib
  20.  
  21. diff -durN glibc-2.18.orig/Makerules glibc-2.18/Makerules
  22. --- glibc-2.18.orig/Makerules   2013-08-11 00:52:55.000000000 +0200
  23. +++ glibc-2.18/Makerules    2014-02-18 23:32:22.009354100 +0100
  24. @@ -108,6 +108,14 @@
  25.  endif # avoid-generated
  26.  endif # $(versioning) = yes
  27.  
  28. +# Hack for building on MSYS2 but using native host (e.g. MinGW-w64) compilers.
  29. +uname_o := $(shell uname -o)
  30. +ifneq (, $(findstring Msys, $(uname_o)))
  31. +common-objpfxh = $(shell cd $(common-objpfx); pwd -W)/
  32. +else
  33. +common-objpfxh = $(common-objpfx)
  34. +endif
  35. +
  36.  ifndef avoid-generated
  37.  before-compile := $(common-objpfx)libc-abis.h $(before-compile)
  38.  $(common-objpfx)libc-abis.h: $(common-objpfx)libc-abis.stamp; @:
  39. @@ -372,8 +380,8 @@
  40.  ifneq (,$(objpfx))
  41.  # Continuation lines here are dangerous because they introduce spaces!
  42.  define sed-remove-objpfx
  43. --e 's@ $(subst .,\.,$(subst @,\@,$(common-objpfx)))@ $$(common-objpfx)@g' \
  44. --e 's@^$(subst .,\.,$(subst @,\@,$(common-objpfx)))@$$(common-objpfx)@g'
  45. +-e 's@ $(subst .,\.,$(subst @,\@,$(common-objpfxh)))@ $$(common-objpfx)@g' \
  46. +-e 's@^$(subst .,\.,$(subst @,\@,$(common-objpfxh)))@$$(common-objpfx)@g'
  47.  endef
  48.  endif
  49.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement