diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2013-10-24 00:24:18 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-10-26 11:53:24 +0200 |
| commit | eb742c19566e77086967d20b0df789b3ccafe3e6 (patch) | |
| tree | e1b2f05d17a0081ea46d2e4aedf96d8eeea67210 /package/docker | |
| parent | 70da2ae5ff0c816c7a0c500293b50d3d0dd9b641 (diff) | |
| download | buildroot-eb742c19566e77086967d20b0df789b3ccafe3e6.tar.gz buildroot-eb742c19566e77086967d20b0df789b3ccafe3e6.zip | |
docker: change into generic-package
docker is using autotools-package while it is in fact just a plain make
package.
Remove docker-1.5-skip-configure.patch which was just a hack to avoid
calling the non-existent configure script.
Remove docker-1.5-pkgconfig.patch which is not needed when PATH is set
appropriately.
Add a XLIBPATH option to the command line to avoid linking with
/usr/X11R6/lib.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/docker')
| -rw-r--r-- | package/docker/docker-1.5-pkgconfig.patch | 23 | ||||
| -rw-r--r-- | package/docker/docker-1.5-skip-configure.patch | 4 | ||||
| -rw-r--r-- | package/docker/docker.mk | 20 |
3 files changed, 10 insertions, 37 deletions
diff --git a/package/docker/docker-1.5-pkgconfig.patch b/package/docker/docker-1.5-pkgconfig.patch deleted file mode 100644 index 1b56b1bd46..0000000000 --- a/package/docker/docker-1.5-pkgconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 $@ -+ `$(PKG_CONFIG) --libs glib-2.0` $^ -o $@ - - %.o: %.c -- $(CC) -c $(CFLAGS) `pkg-config --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-1.5-skip-configure.patch b/package/docker/docker-1.5-skip-configure.patch deleted file mode 100644 index 441f9b05ef..0000000000 --- a/package/docker/docker-1.5-skip-configure.patch +++ /dev/null @@ -1,4 +0,0 @@ ---- a/.stamp_configured 2008-03-19 03:34:24.425005162 -0400 -+++ b/.stamp_configured 2008-03-19 14:25:33.000000000 -0400 -@@ -0,0 +1 @@ -+ diff --git a/package/docker/docker.mk b/package/docker/docker.mk index 82cabec1ba..255860b75c 100644 --- a/package/docker/docker.mk +++ b/package/docker/docker.mk @@ -6,16 +6,16 @@ DOCKER_VERSION = 1.5 DOCKER_SITE = http://icculus.org/openbox/2/docker +DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11 -DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \ - CFLAGS="-I$(STAGING_DIR)/usr/include \ - -I$(STAGING_DIR)/usr/include/glib-2.0 \ - -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" - -DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install +define DOCKER_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + XLIBPATH=$(STAGING_DIR)/usr/lib +endef -DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11 +define DOCKER_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + XLIBPATH=$(STAGING_DIR)/usr/lib PREFIX=$(TARGET_DIR)/usr install +endef -$(eval $(autotools-package)) +$(eval $(generic-package)) |
