mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 13:16:35 +00:00
pkgconfig fix for docker
This commit is contained in:
parent
bce15df3be
commit
1a596bfe2f
23
package/docker/docker-1.5-pkgconfig.patch
Normal file
23
package/docker/docker-1.5-pkgconfig.patch
Normal file
@ -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 > $@
|
@ -12,7 +12,9 @@ DOCKER_INSTALL_TARGET = YES
|
|||||||
|
|
||||||
DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
|
DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
|
||||||
CFLAGS="-I$(STAGING_DIR)/usr/include" \
|
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
|
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user