pkgconfig fix for docker

diff --git a/package/docker/docker-1.5-pkgconfig.patch b/package/docker/docker-1.5-pkgconfig.patch
new file mode 100644 (file)
index 0000000..cba4d81
--- /dev/null
+++ b/package/docker/docker-1.5-pkgconfig.patch
@@ -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 > $@

diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 4152d43ab283d9bcb0a85115dc2aac5eedd28ab8..f82a48055968bd29052e9a410f1cabef588582a2 100644 (file)
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -12,7 +12,9 @@ DOCKER_INSTALL_TARGET = YES
 
 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