* [Buildroot] svn commit: trunk/buildroot/package/docker
@ 2008-05-02 11:20 ninevoltz at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: ninevoltz at uclibc.org @ 2008-05-02 11:20 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-05-02 04:20:00 -0700 (Fri, 02 May 2008)
New Revision: 21919
Log:
pkgconfig fix for docker
Added:
trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch
Modified:
trunk/buildroot/package/docker/docker.mk
Changeset:
Added: trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch
===================================================================
--- trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch (rev 0)
+++ trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch 2008-05-02 11:20:00 UTC (rev 21919)
@@ -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 > $@
Modified: trunk/buildroot/package/docker/docker.mk
===================================================================
--- trunk/buildroot/package/docker/docker.mk 2008-05-02 09:39:09 UTC (rev 21918)
+++ trunk/buildroot/package/docker/docker.mk 2008-05-02 11:20:00 UTC (rev 21919)
@@ -12,7 +12,9 @@
DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
@ 2008-07-08 5:41 ulf at uclibc.org
2008-07-08 6:40 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: ulf at uclibc.org @ 2008-07-08 5:41 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-07 22:41:44 -0700 (Mon, 07 Jul 2008)
New Revision: 22682
Log:
Add glib2.0 specific include/pkconfig paths in 'docker'
Modified:
trunk/buildroot/package/docker/docker.mk
Changeset:
Modified: trunk/buildroot/package/docker/docker.mk
===================================================================
--- trunk/buildroot/package/docker/docker.mk 2008-07-08 05:14:36 UTC (rev 22681)
+++ trunk/buildroot/package/docker/docker.mk 2008-07-08 05:41:44 UTC (rev 22682)
@@ -11,10 +11,13 @@
DOCKER_INSTALL_TARGET = YES
DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
- CFLAGS="-I$(STAGING_DIR)/usr/include" \
+ CFLAGS="-I$(STAGING_DIR)/usr/include \
+ -I$(STAGING_DIR)/usr/include/glib-2.0 \
+ -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
- PKG_CONFIG_SYSROOT="$(STAGING_DIR)"
+ PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
2008-07-08 5:41 [Buildroot] svn commit: trunk/buildroot/package/docker ulf at uclibc.org
@ 2008-07-08 6:40 ` Peter Korsgaard
2008-07-08 9:25 ` Ulf Samuelsson
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2008-07-08 6:40 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2008-07-07 22:41:44 -0700 (Mon, 07 Jul 2008)
ulf> New Revision: 22682
ulf> Log:
ulf> Add glib2.0 specific include/pkconfig paths in 'docker'
ulf> Modified:
ulf> trunk/buildroot/package/docker/docker.mk
..
ulf> DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
ulf> - CFLAGS="-I$(STAGING_DIR)/usr/include" \
ulf> + CFLAGS="-I$(STAGING_DIR)/usr/include \
ulf> + -I$(STAGING_DIR)/usr/include/glib-2.0 \
ulf> + -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
ulf> LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
ulf> PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
ulf> - PKG_CONFIG_SYSROOT="$(STAGING_DIR)"
ulf> + PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
ulf> + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
Is all of this needed? And shouldn't it be PKG_CONFIG_SYSROOT_DIR
instead? We don't use the pkgconfig wrapper anymore.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
2008-07-08 6:40 ` Peter Korsgaard
@ 2008-07-08 9:25 ` Ulf Samuelsson
2008-07-08 9:52 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: Ulf Samuelsson @ 2008-07-08 9:25 UTC (permalink / raw)
To: buildroot
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Peter Korsgaard skrev:
>>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
>
> ulf> Author: ulf
> ulf> Date: 2008-07-07 22:41:44 -0700 (Mon, 07 Jul 2008)
> ulf> New Revision: 22682
>
> ulf> Log:
> ulf> Add glib2.0 specific include/pkconfig paths in 'docker'
>
> ulf> Modified:
> ulf> trunk/buildroot/package/docker/docker.mk
>
> ..
>
> ulf> DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
> ulf> - CFLAGS="-I$(STAGING_DIR)/usr/include" \
> ulf> + CFLAGS="-I$(STAGING_DIR)/usr/include \
> ulf> + -I$(STAGING_DIR)/usr/include/glib-2.0 \
> ulf> + -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
> ulf> LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
> ulf> PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
> ulf> - PKG_CONFIG_SYSROOT="$(STAGING_DIR)"
> ulf> + PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
> ulf> + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
>
>
> Is all of this needed? And shouldn't it be PKG_CONFIG_SYSROOT_DIR
> instead? We don't use the pkgconfig wrapper anymore.
>
I tried building both ARM and AVR32 and without this,
and both are broken.
docker will use host pkgconfigs instead of target pkgconfigs.
BR
Ulf Samuelsson
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFIczKNAyRRH5cXxqwRAkgNAJ9anH30+ChAJ0V+tTsDpKVvkp0jUACgsVW5
ia76vWQIpFptlHw8IckC7qg=
=YPLd
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
2008-07-08 9:25 ` Ulf Samuelsson
@ 2008-07-08 9:52 ` Peter Korsgaard
2008-07-08 10:01 ` Ulf Samuelsson
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2008-07-08 9:52 UTC (permalink / raw)
To: buildroot
>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
>> Is all of this needed? And shouldn't it be PKG_CONFIG_SYSROOT_DIR
>> instead? We don't use the pkgconfig wrapper anymore.
>>
Ulf> I tried building both ARM and AVR32 and without this,
Ulf> and both are broken.
Ulf> docker will use host pkgconfigs instead of target pkgconfigs.
And with PKG_CONFIG_SYSROOT_DIR?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
2008-07-08 9:52 ` Peter Korsgaard
@ 2008-07-08 10:01 ` Ulf Samuelsson
0 siblings, 0 replies; 9+ messages in thread
From: Ulf Samuelsson @ 2008-07-08 10:01 UTC (permalink / raw)
To: buildroot
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Peter Korsgaard skrev:
>>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
>
> >> Is all of this needed? And shouldn't it be PKG_CONFIG_SYSROOT_DIR
> >> instead? We don't use the pkgconfig wrapper anymore.
> >>
> Ulf> I tried building both ARM and AVR32 and without this,
> Ulf> and both are broken.
> Ulf> docker will use host pkgconfigs instead of target pkgconfigs.
>
> And with PKG_CONFIG_SYSROOT_DIR?
>
I do not mind that you update as long as it builds for ARM & AVR32.
BR
Ulf Samuelsson
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFIczrvAyRRH5cXxqwRAosuAKCAldFYwOJ0Dz6iMlzecXyvhHUc8ACfa3cf
GfvocmwugLh+dHDKTSZ0kG4=
=Jou7
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
@ 2008-10-26 9:14 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-10-26 9:14 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-26 02:14:06 -0700 (Sun, 26 Oct 2008)
New Revision: 23796
Log:
docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent
Patch by Markus Heidelberg.
Modified:
trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch
trunk/buildroot/package/docker/docker.mk
Changeset:
Modified: trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch
===================================================================
--- trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch 2008-10-26 09:14:02 UTC (rev 23795)
+++ trunk/buildroot/package/docker/docker-1.5-pkgconfig.patch 2008-10-26 09:14:06 UTC (rev 23796)
@@ -13,11 +13,11 @@
$(target): $(sources:.c=.o)
$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
- `pkg-config --libs glib-2.0` $^ -o $@
-+ `$(PKGCONFIG) --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) `$(PKGCONFIG) --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 > $@
Modified: trunk/buildroot/package/docker/docker.mk
===================================================================
--- trunk/buildroot/package/docker/docker.mk 2008-10-26 09:14:02 UTC (rev 23795)
+++ trunk/buildroot/package/docker/docker.mk 2008-10-26 09:14:06 UTC (rev 23796)
@@ -14,6 +14,7 @@
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="$(STAGING_DIR)/usr/bin/pkg-config" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
@ 2008-10-26 9:14 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-10-26 9:14 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-26 02:14:10 -0700 (Sun, 26 Oct 2008)
New Revision: 23797
Log:
docker: strip on target install
Modified:
trunk/buildroot/package/docker/docker.mk
Changeset:
Modified: trunk/buildroot/package/docker/docker.mk
===================================================================
--- trunk/buildroot/package/docker/docker.mk 2008-10-26 09:14:06 UTC (rev 23796)
+++ trunk/buildroot/package/docker/docker.mk 2008-10-26 09:14:10 UTC (rev 23797)
@@ -23,3 +23,6 @@
$(eval $(call AUTOTARGETS,package,docker))
+$(DOCKER_HOOK_POST_INSTALL): $(DOCKER_TARGET_INSTALL_TARGET)
+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/docker
+ touch $@
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/docker
@ 2008-10-26 9:14 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-10-26 9:14 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-26 02:14:13 -0700 (Sun, 26 Oct 2008)
New Revision: 23798
Log:
docker: requires pkgconfig, glib2 and X11
Modified:
trunk/buildroot/package/docker/Config.in
trunk/buildroot/package/docker/docker.mk
Changeset:
Modified: trunk/buildroot/package/docker/Config.in
===================================================================
--- trunk/buildroot/package/docker/Config.in 2008-10-26 09:14:10 UTC (rev 23797)
+++ trunk/buildroot/package/docker/Config.in 2008-10-26 09:14:13 UTC (rev 23798)
@@ -1,5 +1,8 @@
config BR2_PACKAGE_DOCKER
bool "docker"
+ depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_PKGCONFIG
help
a system tray dock for X
Modified: trunk/buildroot/package/docker/docker.mk
===================================================================
--- trunk/buildroot/package/docker/docker.mk 2008-10-26 09:14:10 UTC (rev 23797)
+++ trunk/buildroot/package/docker/docker.mk 2008-10-26 09:14:13 UTC (rev 23798)
@@ -19,7 +19,7 @@
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
-DOCKER_DEPENDENCIES = uclibc
+DOCKER_DEPENDENCIES = uclibc pkgconfig libglib2 $(XSERVER)
$(eval $(call AUTOTARGETS,package,docker))
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2008-10-26 9:14 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-08 5:41 [Buildroot] svn commit: trunk/buildroot/package/docker ulf at uclibc.org
2008-07-08 6:40 ` Peter Korsgaard
2008-07-08 9:25 ` Ulf Samuelsson
2008-07-08 9:52 ` Peter Korsgaard
2008-07-08 10:01 ` Ulf Samuelsson
-- strict thread matches above, loose matches on Subject: below --
2008-10-26 9:14 jacmet at uclibc.org
2008-10-26 9:14 jacmet at uclibc.org
2008-10-26 9:14 jacmet at uclibc.org
2008-05-02 11:20 ninevoltz at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox