From: Markus Heidelberg <markus.heidelberg@web.de>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent
Date: Sat, 25 Oct 2008 01:09:44 +0200 [thread overview]
Message-ID: <200810250109.44430.markus.heidelberg@web.de> (raw)
---
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
next reply other threads:[~2008-10-24 23:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-24 23:09 Markus Heidelberg [this message]
2008-10-26 9:14 ` [Buildroot] [PATCH] docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent Peter Korsgaard
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=200810250109.44430.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--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