From 70ad172e6e50d739f723c6000b0714799eff21fe Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Wed, 24 Jun 2015 23:23:48 -0400 Subject: [PATCH] libpng: rebase ignore-symbol-prefix patch to apply cleanly Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- .../libpng/0002-ignore-symbol-prefix.patch | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/package/libpng/0002-ignore-symbol-prefix.patch b/package/libpng/0002-ignore-symbol-prefix.patch index 7f2cfff248..5a8ede58a9 100644 --- a/package/libpng/0002-ignore-symbol-prefix.patch +++ b/package/libpng/0002-ignore-symbol-prefix.patch @@ -1,10 +1,27 @@ +From dbfea83a7436cbac34cc883ab2b7befacaf02c40 Mon Sep 17 00:00:00 2001 +From: Danomi Manchego +Date: Tue, 23 Jun 2015 13:54:42 -0400 +Subject: libpng: don't append prefix to symbol names in version script + Even if Blackfin GNU toolchain add prefix '_' to all symbols, symbol prefix is not accepted in the link flag --version-script. Don't append prefix in the symbols in the version script file. ---- libpng-1.6.8/Makefile.am 2013-12-30 18:23:08.261797417 +0800 -+++ libpng-1.6.8.bak/Makefile.am 2013-12-30 18:22:15.565795726 +0800 -@@ -225,7 +225,7 @@ +Original patch by: Sonic Zhang + +Rebase to apply cleanly. + +Signed-off-by: Danomi Manchego +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index dcc5439..e543c81 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -231,7 +231,7 @@ contrib/tools/pngfix.o: pnglibconf.h # interfering with the symbol file format. SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ -DPNGLIB_VERSION='@PNGLIB_VERSION@'\ @@ -13,14 +30,19 @@ Don't append prefix in the symbols in the version script file. -DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE if DO_PNG_PREFIX ---- libpng-1.6.8/Makefile.in 2013-12-30 18:23:08.261797417 +0800 -+++ libpng-1.6.8.bak/Makefile.in 2013-12-30 18:22:09.853794547 +0800 -@@ -698,7 +698,7 @@ +diff --git a/Makefile.in b/Makefile.in +index 975f931..a3e0552 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -747,7 +747,7 @@ SUFFIXES = .chk .out # interfering with the symbol file format. SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0' \ -DPNGLIB_VERSION='@PNGLIB_VERSION@' \ - -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \ + -DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \ -DPNG_BUILDING_SYMBOL_TABLE $(am__append_5) - all: $(BUILT_SOURCES) config.h - $(MAKE) $(AM_MAKEFLAGS) all-am + + # EXT_LIST is a list of the possibly library directory extensions, this exists +-- +1.7.9.5 + -- 2.30.2