diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-21 09:32:42 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-23 00:01:45 +0200 |
| commit | a12deac01d6e20bb5e22b1ea700d8e6f7321143d (patch) | |
| tree | 5dd6210c7ac25641006f2374b1fa196c1c4ecc8b /patches/hpanel-0.3.2 | |
| parent | 010ee00573267b7946283ce85a7593891d9d92b3 (diff) | |
| download | ptxdist-a12deac01d6e20bb5e22b1ea700d8e6f7321143d.tar.gz ptxdist-a12deac01d6e20bb5e22b1ea700d8e6f7321143d.tar.xz | |
hpanel: use LDLIBS instead of LDFLAGS for libs.
Without this the libraries come first on the command line, and
building fails with -Wl,--as-needed
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/hpanel-0.3.2')
| -rw-r--r-- | patches/hpanel-0.3.2/0001-Patches-the-Makefile-to-be-able-to-cross-compile.patch (renamed from patches/hpanel-0.3.2/cross.patch) | 16 | ||||
| -rw-r--r-- | patches/hpanel-0.3.2/series | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/patches/hpanel-0.3.2/cross.patch b/patches/hpanel-0.3.2/0001-Patches-the-Makefile-to-be-able-to-cross-compile.patch index 3087bbe1d..f99a0028a 100644 --- a/patches/hpanel-0.3.2/cross.patch +++ b/patches/hpanel-0.3.2/0001-Patches-the-Makefile-to-be-able-to-cross-compile.patch @@ -1,19 +1,21 @@ -Subject: Patches the Makefile to be able to cross compile -From: j.beisert@pengutronix.de +From: Juergen Beisert <j.beisert@pengutronix.de> +Date: Tue, 21 Jun 2011 09:27:25 +0200 +Subject: [PATCH] Patches the Makefile to be able to cross compile The original makefile assumes fixed pathes to libraries and include files. This patch replace them with calls to pkg_config. Don't strip the binary. targetinstall will do this. Install to $(DESTDIR). +Forwarded: not-needed (upstream dead) Signed-off-by: j.beisert@pengutronix.de - +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- Makefile | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) + 1 files changed, 10 insertions(+), 9 deletions(-) -Index: b/Makefile -=================================================================== +diff --git a/Makefile b/Makefile +index 9d20d90..28519a7 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ @@ -23,7 +25,7 @@ Index: b/Makefile +.PHONY: install clean + +CFLAGS +=-O2 -g `pkg-config --cflags xft` `pkg-config --cflags xpm` -DCLOCK -+LDFLAGS +=`pkg-config --libs xft` `pkg-config --libs xpm` ++LDLIBS +=`pkg-config --libs xft` `pkg-config --libs xpm` PROGNAME=hpanel -$(PROGNAME): Makefile hpanel.c hpanel.h icon.xpm diff --git a/patches/hpanel-0.3.2/series b/patches/hpanel-0.3.2/series index def274a02..4561eb605 100644 --- a/patches/hpanel-0.3.2/series +++ b/patches/hpanel-0.3.2/series @@ -1 +1,3 @@ -cross.patch +# generated by git-ptx-patches +0001-Patches-the-Makefile-to-be-able-to-cross-compile.patch +# ee25b7b07cba51a7b49037c8a8138fda - git-ptx-patches magic |