* [Buildroot] [PATCH v3 1/2] docker: change into generic-package
@ 2013-10-23 22:24 Arnout Vandecappelle
2013-10-23 22:24 ` [Buildroot] [PATCH v3 2/2] docker: add license info Arnout Vandecappelle
2013-10-26 10:13 ` [Buildroot] [PATCH v3 1/2] docker: change into generic-package Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2013-10-23 22:24 UTC (permalink / raw)
To: buildroot
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>
---
I discovered this while testing Fabio's parallel make patches: the
changed dependency on .stamp_configured made the build fail.
v3: fixed splitting of the patches.
v2: darn, missing S on _CMDS... How did that one slip through?
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/docker/docker-1.5-pkgconfig.patch | 23 -----------------------
package/docker/docker-1.5-skip-configure.patch | 4 ----
package/docker/docker.mk | 20 ++++++++++----------
3 files changed, 10 insertions(+), 37 deletions(-)
delete mode 100644 package/docker/docker-1.5-pkgconfig.patch
delete mode 100644 package/docker/docker-1.5-skip-configure.patch
diff --git a/package/docker/docker-1.5-pkgconfig.patch b/package/docker/docker-1.5-pkgconfig.patch
deleted file mode 100644
index 1b56b1b..0000000
--- 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 441f9b0..0000000
--- 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 82cabec..255860b 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))
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 2/2] docker: add license info
2013-10-23 22:24 [Buildroot] [PATCH v3 1/2] docker: change into generic-package Arnout Vandecappelle
@ 2013-10-23 22:24 ` Arnout Vandecappelle
2013-10-26 10:13 ` [Buildroot] [PATCH v3 1/2] docker: change into generic-package Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2013-10-23 22:24 UTC (permalink / raw)
To: buildroot
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v3: fixed splitting of the patches.
v2: no change
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/docker/docker.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 255860b..9a9d26b 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -8,6 +8,10 @@ DOCKER_VERSION = 1.5
DOCKER_SITE = http://icculus.org/openbox/2/docker
DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
+DOCKER_LICENSE = GPLv2+
+# The 'or later' is specified at the end of the README, so include that one too.
+DOCKER_LICENSE_FILES = COPYING README
+
define DOCKER_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
XLIBPATH=$(STAGING_DIR)/usr/lib
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 1/2] docker: change into generic-package
2013-10-23 22:24 [Buildroot] [PATCH v3 1/2] docker: change into generic-package Arnout Vandecappelle
2013-10-23 22:24 ` [Buildroot] [PATCH v3 2/2] docker: add license info Arnout Vandecappelle
@ 2013-10-26 10:13 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2013-10-26 10:13 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
> 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>
> ---
> I discovered this while testing Fabio's parallel make patches: the
> changed dependency on .stamp_configured made the build fail.
> v3: fixed splitting of the patches.
Committed both, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-26 10:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-23 22:24 [Buildroot] [PATCH v3 1/2] docker: change into generic-package Arnout Vandecappelle
2013-10-23 22:24 ` [Buildroot] [PATCH v3 2/2] docker: add license info Arnout Vandecappelle
2013-10-26 10:13 ` [Buildroot] [PATCH v3 1/2] docker: change into generic-package Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox