Commit 119dd90a authored by Konstantin Pavlov's avatar Konstantin Pavlov

Merge branch 'master' into 'master'

Add a missing snprintf alias to msvcr120_app



See merge request !5
parents 7a895e7d 5831ee28
......@@ -12,6 +12,8 @@ ENV TOOLCHAIN_PREFIX=/opt/gcc-$TARGET_TUPLE
ENV MINGW_PREFIX=$TOOLCHAIN_PREFIX/$TARGET_TUPLE
ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH
COPY missing-snprintf.patch .
RUN mkdir /build && cd /build && \
mkdir $TOOLCHAIN_PREFIX && \
mkdir $MINGW_PREFIX && \
......@@ -48,6 +50,7 @@ RUN mkdir /build && cd /build && \
make -j4 all-gcc && \
make install-gcc && \
cd /build/mingw-w64/mingw-w64-crt && \
git am ../../../missing-snprintf.patch && \
mkdir build && cd build && \
../configure --prefix=$MINGW_PREFIX \
--host=$TARGET_TUPLE && \
......
From 44ad7738b988b86cddc7b171af160c9397cf2b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 29 Apr 2016 11:07:45 +0200
Subject: [PATCH 4/5] crt: Add missing snprintf aliases
---
mingw-w64-crt/lib32/msvcr120_app.def.in | 1 +
mingw-w64-crt/lib64/msvcr120_app.def.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/mingw-w64-crt/lib32/msvcr120_app.def.in b/mingw-w64-crt/lib32/msvcr120_app.def.in
index b29eaf9..0c5aaff 100644
--- a/mingw-w64-crt/lib32/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib32/msvcr120_app.def.in
@@ -1042,6 +1042,7 @@ _vscwprintf_p
_vscwprintf_p_l
_vsnprintf
vsnprintf == _vsnprintf
+snprintf == _snprintf
_vsnprintf_c
_vsnprintf_c_l
_vsnprintf_l
diff --git a/mingw-w64-crt/lib64/msvcr120_app.def.in b/mingw-w64-crt/lib64/msvcr120_app.def.in
index 53b2f7b..b829b84 100644
--- a/mingw-w64-crt/lib64/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib64/msvcr120_app.def.in
@@ -984,6 +984,7 @@ _vscwprintf_p
_vscwprintf_p_l
_vsnprintf
vsnprintf == _vsnprintf
+snprintf == _snprintf
_vsnprintf_c
_vsnprintf_c_l
_vsnprintf_l
--
2.8.1
......@@ -13,6 +13,7 @@ ENV MINGW_PREFIX=$TOOLCHAIN_PREFIX/$TARGET_TUPLE
ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH
COPY no-rtl-func.patch .
COPY missing-snprintf.patch .
RUN mkdir /build && cd /build && \
mkdir $TOOLCHAIN_PREFIX && \
......@@ -23,7 +24,8 @@ RUN mkdir /build && cd /build && \
git config --global user.name "VideoLAN Buildbot" && \
git config --global user.email buildbot@videolan.org && \
git clone --depth=1 git://git.code.sf.net/p/mingw-w64/mingw-w64 && \
cd mingw-w64 && git am ../../no-rtl-func.patch && cd .. && \
cd mingw-w64 && git am ../../no-rtl-func.patch && \
git am ../../missing-snprintf.patch && cd .. && \
tar xf gcc-5.3.0.tar.bz2 && \
tar xf binutils-2.26.tar.bz2 && \
cd binutils-2.26 && mkdir build && cd build && \
......
From 44ad7738b988b86cddc7b171af160c9397cf2b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 29 Apr 2016 11:07:45 +0200
Subject: [PATCH 4/5] crt: Add missing snprintf aliases
---
mingw-w64-crt/lib32/msvcr120_app.def.in | 1 +
mingw-w64-crt/lib64/msvcr120_app.def.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/mingw-w64-crt/lib32/msvcr120_app.def.in b/mingw-w64-crt/lib32/msvcr120_app.def.in
index b29eaf9..0c5aaff 100644
--- a/mingw-w64-crt/lib32/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib32/msvcr120_app.def.in
@@ -1042,6 +1042,7 @@ _vscwprintf_p
_vscwprintf_p_l
_vsnprintf
vsnprintf == _vsnprintf
+snprintf == _snprintf
_vsnprintf_c
_vsnprintf_c_l
_vsnprintf_l
diff --git a/mingw-w64-crt/lib64/msvcr120_app.def.in b/mingw-w64-crt/lib64/msvcr120_app.def.in
index 53b2f7b..b829b84 100644
--- a/mingw-w64-crt/lib64/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib64/msvcr120_app.def.in
@@ -984,6 +984,7 @@ _vscwprintf_p
_vscwprintf_p_l
_vsnprintf
vsnprintf == _vsnprintf
+snprintf == _snprintf
_vsnprintf_c
_vsnprintf_c_l
_vsnprintf_l
--
2.8.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment