diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-07 10:42:58 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-07 10:43:05 +0100 |
| commit | 6c14f9498bafcd51f0b635224f2c8c676d7238ac (patch) | |
| tree | c43528f226cbe407bfe3f590c367782c30c3ca6a | |
| parent | 5570044378be21fc67904eb0a049f35a6be867ee (diff) | |
| download | ptxdist-6c14f9498bafcd51f0b635224f2c8c676d7238ac.tar.gz ptxdist-6c14f9498bafcd51f0b635224f2c8c676d7238ac.tar.xz | |
fbgrab: cleanup and fix building with newer toolchains
libs must be specified after source/object files.
Other flags are now handled by the wrappers.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch | 6 | ||||
| -rw-r--r-- | patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch | 2 | ||||
| -rw-r--r-- | rules/fbgrab.make | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch index 9fd77f9be..e783991b3 100644 --- a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch +++ b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch @@ -9,10 +9,10 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> --- Makefile | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) + 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 14c63cb..252b098 100644 +index 14c63cb..8ae5dc8 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,12 @@ @@ -22,7 +22,7 @@ index 14c63cb..252b098 100644 - splint +posixlib fbgrab.c - gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab +# splint +posixlib fbgrab.c -+ ${CC} ${CPPFLAGS} ${LDFLAGS} fbgrab.c -o fbgrab ++ ${CC} ${CPPFLAGS} fbgrab.c ${LDLIBS} -o fbgrab install: - strip fbgrab diff --git a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch index 6c1b33eac..22474f7ca 100644 --- a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch +++ b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch @@ -8,7 +8,7 @@ we use symbols from there, we should include zlib.h directly. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- fbgrab.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) diff --git a/fbgrab.c b/fbgrab.c index fc89f5a..0c959f6 100644 diff --git a/rules/fbgrab.make b/rules/fbgrab.make index ca9132b94..70fa0f753 100644 --- a/rules/fbgrab.make +++ b/rules/fbgrab.make @@ -30,10 +30,9 @@ FBGRAB_DIR := $(BUILDDIR)/$(FBGRAB) # ---------------------------------------------------------------------------- # overwrite some vars in the makefile -FBGRAB_MAKE_ENV := $(CROSS_ENV) FBGRAB_MAKE_OPT = \ $(CROSS_ENV_CC) \ - LDFLAGS='`$(CROSS_ENV) eval PATH=$(CROSS_PATH) $$PKG_CONFIG --libs libpng` $(CROSS_LDFLAGS)' + LDLIBS='`$(CROSS_ENV) eval PATH=$(CROSS_PATH) $$PKG_CONFIG --libs libpng`' # ---------------------------------------------------------------------------- # Target-Install |