From 187b0f92ab34afb037f498009d50a197df870cbf Mon Sep 17 00:00:00 2001 From: Andoni Morales Date: Wed, 13 Feb 2019 13:38:04 +0100 Subject: libpng: Fix build in native Windows do to incorrect \r inserted Somewhere in the pnglibconf.h generation \r characters are being added. This happens with the new toolchain in native Windows build. libpngconf.h --- recipes/libpng.recipe | 4 ++- ...n-native-Windows-do-to-incorrect-r-insert.patch | 40 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 recipes/libpng/0002-Fix-build-in-native-Windows-do-to-incorrect-r-insert.patch (limited to 'recipes') diff --git a/recipes/libpng.recipe b/recipes/libpng.recipe index 70bd221a..b8418e35 100644 --- a/recipes/libpng.recipe +++ b/recipes/libpng.recipe @@ -9,7 +9,9 @@ class Recipe(recipe.Recipe): tarball_checksum = '505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca' licenses = [{License.LibPNG: ['LICENSE']}] deps = ['zlib'] - patches = [name + '/0001-neon-fix-function-export-names-for-iOS-armv7.patch'] + patches = [name + '/0001-neon-fix-function-export-names-for-iOS-armv7.patch', + name + '/0002-Fix-build-in-native-Windows-do-to-incorrect-r-insert.patch', + ] files_libs = ['libpng16'] files_devel = ['include/libpng16', 'bin/libpng16-config', diff --git a/recipes/libpng/0002-Fix-build-in-native-Windows-do-to-incorrect-r-insert.patch b/recipes/libpng/0002-Fix-build-in-native-Windows-do-to-incorrect-r-insert.patch new file mode 100644 index 00000000..605936d6 --- /dev/null +++ b/recipes/libpng/0002-Fix-build-in-native-Windows-do-to-incorrect-r-insert.patch @@ -0,0 +1,40 @@ +From 1ef89bfa98a50ce097fc12329921afd5f86ab1c9 Mon Sep 17 00:00:00 2001 +From: Nacho Garcia +Date: Wed, 13 Feb 2019 11:32:39 +0100 +Subject: [PATCH 2/2] Fix build in native Windows do to incorrect \r inserted + +Somewhere in the pnglibconf.h generation \r characters +are being added. This happens with the new toolchain +in native Windows build. +--- + Makefile.am | 1 + + Makefile.in | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 08db3e5..ce12b02 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -210,6 +210,7 @@ pnglibconf.h: pnglibconf.out scripts/prefix.out scripts/macro.lst + END{print prev}' s=0 pnglibconf.out s=1 scripts/prefix.out\ + s=2 ${srcdir}/scripts/macro.lst >pnglibconf.tf8 + mv pnglibconf.tf8 $@ ++ sed -i -e "s/\r//g" $@ + + pngprefix.h: scripts/intprefix.out + rm -f pngprefix.tf1 +diff --git a/Makefile.in b/Makefile.in +index 79d2b88..e304b2a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -2268,6 +2268,7 @@ libpng.vers: scripts/vers.out + @DO_PNG_PREFIX_FALSE@pnglibconf.h: pnglibconf.out + @DO_PNG_PREFIX_FALSE@ rm -f $@ + @DO_PNG_PREFIX_FALSE@ cp $? $@ ++@DO_PNG_PREFIX_FALSE@ sed -i -e "s/\r//g" $@ + + @DO_PNG_PREFIX_FALSE@pngprefix.h: # is empty + @DO_PNG_PREFIX_FALSE@ :>$@ +-- +2.18.0.windows.1 + -- cgit v1.2.3