Skip to contentSkip to conversation

docker: change into generic-package

PATCH New Arnout Vandecappelle (Essensium/Mind) 2 participants 3 messages Oct 23, 2013 – Oct 26, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 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.

---
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?

---
 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
package/docker/docker-1.5-pkgconfig.patch deleted +0 -23
deleted file mode 100644
index 1b56b1b..0000000
@@ -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 > $@
package/docker/docker-1.5-skip-configure.patch deleted +0 -4
deleted file mode 100644
index 441f9b0..0000000
@@ -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 @@
-+ 
package/docker/docker.mk +10 -10
index 82cabec..255860b 100644
@@ -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))
Signature · 1 line
1.8.4.rc3
#1 lore raw

PATCH v3 2/2 docker: add license info

---
v3: fixed splitting of the patches.

v2: no change

---
 package/docker/docker.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/docker/docker.mk +4 -0
index 255860b..9a9d26b 100644
@@ -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
Signature · 1 line
1.8.4.rc3
#2 lore raw

PATCH v3 1/2 docker: change into generic-package

In reply to Arnout Vandecappelle (Essensium/Mind)
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> 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.

Quoted 6 lines

---
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.

Signature · 1 line
Bye, Peter Korsgaard