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/docker.mk | |
| 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/docker.mk')
| -rw-r--r-- | package/docker/docker.mk | 20 |
1 files changed, 10 insertions, 10 deletions
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)) |
