NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent

Browse Source 
Patch by Markus Heidelberg.
This commit is contained in:
Peter Korsgaard 2008-10-26 09:14:06 +00:00
parent 7543f7dff4
commit ac71691272
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/docker/docker-1.5-pkgconfig.patch
View File

@ -13,11 +13,11 @@
$(target): $(sources:.c=.o) $(target): $(sources:.c=.o)
$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \ $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
- `pkg-config --libs glib-2.0` $^ -o $@ - `pkg-config --libs glib-2.0` $^ -o $@
+ `$(PKGCONFIG) --libs glib-2.0` $^ -o $@ + `$(PKG_CONFIG) --libs glib-2.0` $^ -o $@
%.o: %.c %.o: %.c
- $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $< - $(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 version.h: version.h.in Makefile
sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@ sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@

1
package/docker/docker.mk
View File

@ -14,6 +14,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
CFLAGS="-I$(STAGING_DIR)/usr/include \ CFLAGS="-I$(STAGING_DIR)/usr/include \
-I$(STAGING_DIR)/usr/include/glib-2.0 \ -I$(STAGING_DIR)/usr/include/glib-2.0 \
-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \ -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install