jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

libpng: rebase ignore-symbol-prefix patch to apply cleanly

Browse Source 
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Danomi Manchego 2015-06-24 23:23:48 -04:00 committed by Thomas Petazzoni
parent fed646f164
commit 70ad172e6e
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/libpng/0002-ignore-symbol-prefix.patch
View File

@ -1,10 +1,27 @@
From dbfea83a7436cbac34cc883ab2b7befacaf02c40 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
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, Even if Blackfin GNU toolchain add prefix '_' to all symbols,
symbol prefix is not accepted in the link flag --version-script. symbol prefix is not accepted in the link flag --version-script.
Don't append prefix in the symbols in the version script file. 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 Original patch by: Sonic Zhang <sonic.zhang@analog.com>
+++ libpng-1.6.8.bak/Makefile.am 2013-12-30 18:22:15.565795726 +0800
@@ -225,7 +225,7 @@ Rebase to apply cleanly.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
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. # interfering with the symbol file format.
SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
-DPNGLIB_VERSION='@PNGLIB_VERSION@'\ -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 -DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE
if DO_PNG_PREFIX if DO_PNG_PREFIX
--- libpng-1.6.8/Makefile.in 2013-12-30 18:23:08.261797417 +0800 diff --git a/Makefile.in b/Makefile.in
+++ libpng-1.6.8.bak/Makefile.in 2013-12-30 18:22:09.853794547 +0800 index 975f931..a3e0552 100644
@@ -698,7 +698,7 @@ --- a/Makefile.in
+++ b/Makefile.in
@@ -747,7 +747,7 @@ SUFFIXES = .chk .out
# interfering with the symbol file format. # interfering with the symbol file format.
SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0' \ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0' \
-DPNGLIB_VERSION='@PNGLIB_VERSION@' \ -DPNGLIB_VERSION='@PNGLIB_VERSION@' \
- -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \ - -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \
+ -DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \ + -DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \
-DPNG_BUILDING_SYMBOL_TABLE $(am__append_5) -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