Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Banky <martin.banky@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] host-libpng: Symbols creation fails with ccache
Date: Mon,  4 Oct 2010 17:47:01 -0700	[thread overview]
Message-ID: <1286239621-31904-3-git-send-email-Martin.Banky@gmail.com> (raw)
In-Reply-To: <1286239621-31904-1-git-send-email-Martin.Banky@gmail.com>

Makefile assumes the output from $(CPP) will be to stdout, but ccache does not
pass the output of $(CPP) to stdout. The Makefile creates an empty symbols
file, which causes the version file to be incorrect. This causes ld to exit
with the error 'libpng.vers:2: syntax error in VERSION script'.

See:
https://sourceforge.net/tracker/?func=detail&aid=3081199&group_id=5624&atid=105624
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 package/libpng/libpng-1.4.4-ccache-version.patch |   25 ++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 package/libpng/libpng-1.4.4-ccache-version.patch

diff --git a/package/libpng/libpng-1.4.4-ccache-version.patch b/package/libpng/libpng-1.4.4-ccache-version.patch
new file mode 100644
index 0000000..e1f61e6
--- /dev/null
+++ b/package/libpng/libpng-1.4.4-ccache-version.patch
@@ -0,0 +1,25 @@
+--- a/Makefile.am	2010-09-23 05:18:36.000000000 -0700
++++ b/Makefile.am	2010-10-04 15:51:29.000000000 -0700
+@@ -88,7 +88,8 @@ $(PNGLIB_BASENAME)-config: libpng-config
+ 
+ libpng.sym: png.h pngconf.h
+ 	rm -f $@ $@.new
+-	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
++	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
++	cat $(srcdir)/$@ | \
+ 		$(SED) -n -e \
+ 		's|^.*PNG_FUNCTION_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
+ 		-e 's|^.*PNG_DATA_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
+
+--- a/Makefile.in	2010-09-23 05:18:43.000000000 -0700
++++ b/Makefile.in	2010-10-04 15:51:29.000000000 -0700
+@@ -1213,7 +1213,8 @@ $(PNGLIB_BASENAME)-config: libpng-config
+ 
+ libpng.sym: png.h pngconf.h
+ 	rm -f $@ $@.new
+-	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
++	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
++	cat $(srcdir)/$@ | \
+ 		$(SED) -n -e \
+ 		's|^.*PNG_FUNCTION_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
+ 		-e 's|^.*PNG_DATA_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
-- 
1.7.3.1

      parent reply	other threads:[~2010-10-05  0:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-05  0:46 [Buildroot] [PATCH 0/2] BugFix host-libpng Martin Banky
2010-10-05  0:47 ` [Buildroot] [PATCH 1/2] libpng: bump to 1.4.4 Martin Banky
2010-10-05  0:47 ` Martin Banky [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1286239621-31904-3-git-send-email-Martin.Banky@gmail.com \
    --to=martin.banky@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox