* [Buildroot] [PATCH] docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent
@ 2008-10-24 23:09 Markus Heidelberg
2008-10-26 9:14 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Markus Heidelberg @ 2008-10-24 23:09 UTC (permalink / raw)
To: buildroot
---
package/docker/docker-1.5-pkgconfig.patch | 4 ++--
package/docker/docker.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/docker/docker-1.5-pkgconfig.patch b/package/docker/docker-1.5-pkgconfig.patch
index cba4d81..1b56b1b 100644
--- a/package/docker/docker-1.5-pkgconfig.patch
+++ b/package/docker/docker-1.5-pkgconfig.patch
@@ -13,11 +13,11 @@
$(target): $(sources:.c=.o)
$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
- `pkg-config --libs glib-2.0` $^ -o $@
-+ `$(PKGCONFIG) --libs glib-2.0` $^ -o $@
++ `$(PKG_CONFIG) --libs glib-2.0` $^ -o $@
%.o: %.c
- $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
-+ $(CC) -c $(CFLAGS) `$(PKGCONFIG) --cflags glib-2.0` $<
++ $(CC) -c $(CFLAGS) `$(PKG_CONFIG) --cflags glib-2.0` $<
version.h: version.h.in Makefile
sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 78137cc..1e41ea9 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -15,7 +15,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
-I$(STAGING_DIR)/usr/include/glib-2.0 \
-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
- PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+ PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
--
1.5.6.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent
2008-10-24 23:09 [Buildroot] [PATCH] docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent Markus Heidelberg
@ 2008-10-26 9:14 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2008-10-26 9:14 UTC (permalink / raw)
To: buildroot
>>>>> "Markus" == Markus Heidelberg <markus.heidelberg@web.de> writes:
Markus> ---
Markus> package/docker/docker-1.5-pkgconfig.patch | 4 ++--
Markus> package/docker/docker.mk | 2 +-
Markus> 2 files changed, 3 insertions(+), 3 deletions(-)
Thanks, committed.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-10-26 9:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-24 23:09 [Buildroot] [PATCH] docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent Markus Heidelberg
2008-10-26 9:14 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.