From: ninevoltz at uclibc.org <ninevoltz@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/docker
Date: Fri, 2 May 2008 04:20:01 -0700 (PDT) [thread overview]
Message-ID: <20080502112001.0FD603C732@busybox.net> (raw)
Author: ninevoltz
Date: 2008-05-02 04:20:00 -0700 (Fri, 02 May 2008)
New Revision: 21919
Log:
pkgconfig fix for docker
Added:
trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch
Modified:
trunk/buildroot/package/docker/docker.mk
Changeset:
Added: trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch
===================================================================
--- trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch (rev 0)
+++ trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch 2008-05-02 11:20:00 UTC (rev 21919)
@@ -0,0 +1,23 @@
+--- a/Makefile 2002-11-20 05:20:49.000000000 -0500
++++ b/Makefile 2008-04-28 12:36:23.000000000 -0400
+@@ -20,7 +20,6 @@ CFLAGS=-pedantic -Wall -W -O
+
+ PACKAGE=docker
+ VERSION=1.5
+-
+ target=docker
+ sources=docker.c kde.c icons.c xproperty.c net.c
+ headers=docker.h kde.h icons.h xproperty.h net.h version.h
+@@ -31,10 +30,10 @@ all: $(target) $(sources) $(headers)
+
+ $(target): $(sources:.c=.o)
+ $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
+- `pkg-config --libs glib-2.0` $^ -o $@
++ `$(PKGCONFIG) --libs glib-2.0` $^ -o $@
+
+ %.o: %.c
+- $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
++ $(CC) -c $(CFLAGS) `$(PKGCONFIG) --cflags glib-2.0` $<
+
+ version.h: version.h.in Makefile
+ sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
Modified: trunk/buildroot/package/docker/docker.mk
===================================================================
--- trunk/buildroot/package/docker/docker.mk 2008-05-02 09:39:09 UTC (rev 21918)
+++ trunk/buildroot/package/docker/docker.mk 2008-05-02 11:20:00 UTC (rev 21919)
@@ -12,7 +12,9 @@
DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
CFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+ PKG_CONFIG_SYSROOT="$(STAGING_DIR)"
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
next reply other threads:[~2008-05-02 11:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-02 11:20 ninevoltz at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-08 5:41 [Buildroot] svn commit: trunk/buildroot/package/docker ulf at uclibc.org
2008-07-08 6:40 ` Peter Korsgaard
2008-07-08 9:25 ` Ulf Samuelsson
2008-07-08 9:52 ` Peter Korsgaard
2008-07-08 10:01 ` Ulf Samuelsson
2008-10-26 9:14 jacmet at uclibc.org
2008-10-26 9:14 jacmet at uclibc.org
2008-10-26 9:14 jacmet at uclibc.org
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=20080502112001.0FD603C732@busybox.net \
--to=ninevoltz@uclibc.org \
--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