* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
@ 2009-01-30 7:40 ulf at uclibc.org
2009-01-30 8:27 ` Daniel James Laird
2009-01-30 8:51 ` Peter Korsgaard
0 siblings, 2 replies; 9+ messages in thread
From: ulf at uclibc.org @ 2009-01-30 7:40 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-30 07:40:14 +0000 (Fri, 30 Jan 2009)
New Revision: 25156
Log:
Fix dbus dependency on libxml2, without rebuild, works but may need refinement
Added:
trunk/buildroot/package/0/
trunk/buildroot/package/0/0-run-first.mk
Modified:
trunk/buildroot/package/dbus/dbus.mk
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Added: trunk/buildroot/package/0/0-run-first.mk
===================================================================
--- trunk/buildroot/package/0/0-run-first.mk (rev 0)
+++ trunk/buildroot/package/0/0-run-first.mk 2009-01-30 07:40:14 UTC (rev 25156)
@@ -0,0 +1,4 @@
+ifeq ($(BR2_TARGET_LIBXML2),y)
+TARGETS+=libxml2
+endif
+
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-29 23:32:06 UTC (rev 25155)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-30 07:40:14 UTC (rev 25156)
@@ -15,17 +15,17 @@
DBUS_XML:=expat
# depend on the exact library file instead of expat so dbus isn't always
# considered out-of-date
-DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
# Makefile.autotools.in unfortunately has broken dependency handling,
# so we cannot do the same for libxml2
-DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
+DBUS_XML_DEP:=$(LIBXML2_HOOK_POST_INSTALL)
#libxml2-install-staging
endif
-DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
+
$(DL_DIR)/$(DBUS_SOURCE):
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
@@ -37,6 +37,7 @@
$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
(cd $(DBUS_DIR); rm -rf config.cache; \
+ echo "dbus is depending on $(DBUS_XML_DEP)"; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
ac_cv_have_abstract_sockets=yes \
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2009-01-29 23:32:06 UTC (rev 25155)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2009-01-30 07:40:14 UTC (rev 25156)
@@ -8,7 +8,7 @@
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
LIBXML2_INSTALL_STAGING = YES
LIBXML2_INSTALL_TARGET = YES
-
+LIBXML2_LIBTOOL_PATCH = NO
ifneq ($(BR2_LARGEFILE),y)
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
@@ -27,10 +27,21 @@
rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
touch $@
-$(LIBXML2_HOOK_POST_INSTALL):
+$(LIBXML2_HOOK_POST_INSTALL):\
+ $(LIBXML2_TARGET_SOURCE) \
+ $(LIBXML2_TARGET_EXTRACT) \
+ $(LIBXML2_HOOK_POST_EXTRACT) \
+ $(LIBXML2_TARGET_PATCH) \
+ $(LIBXML2_TARGET_AUTORECONF) \
+ $(LIBXML2_TARGET_CONFIGURE) \
+ $(LIBXML2_TARGET_LIBTOOL_PATCH) \
+ $(LIBXML2_TARGET_BUILD) \
+ $(LIBXML2_HOOK_POST_BUILD) \
+ $(LIBXML2_TARGET_INSTALL_STAGING)
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
rm -rf $(TARGET_DIR)/usr/share/aclocal \
$(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
$(TARGET_DIR)/usr/share/gtk-doc
touch $@
+
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
2009-01-30 7:40 [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2 ulf at uclibc.org
@ 2009-01-30 8:27 ` Daniel James Laird
2009-01-30 9:03 ` Ulf Samuelsson
2009-01-30 8:51 ` Peter Korsgaard
1 sibling, 1 reply; 9+ messages in thread
From: Daniel James Laird @ 2009-01-30 8:27 UTC (permalink / raw)
To: buildroot
How is the dependency checking broken? are you saying that if you build dbus with out XML2 support and then enable XML2 support DBUS does not rebuild?
This does seems like a rather specific fix that fixes just packages that depend on LIBXML2.
It seems that the changes to LIBXML2 rather spoil the point of Makefile.autotools.in which is to make the package makefiles as simple and common as possible.
Cheers
Dan
-----Original Message-----
From: buildroot-bounces@busybox.net [mailto:buildroot-bounces at busybox.net] On Behalf Of ulf at uclibc.org
Sent: 2009 Jan 30 07:40
To: buildroot at uclibc.org
Subject: [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
Author: ulf
Date: 2009-01-30 07:40:14 +0000 (Fri, 30 Jan 2009)
New Revision: 25156
Log:
Fix dbus dependency on libxml2, without rebuild, works but may need refinement
Added:
trunk/buildroot/package/0/
trunk/buildroot/package/0/0-run-first.mk
Modified:
trunk/buildroot/package/dbus/dbus.mk
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Added: trunk/buildroot/package/0/0-run-first.mk
===================================================================
--- trunk/buildroot/package/0/0-run-first.mk (rev 0)
+++ trunk/buildroot/package/0/0-run-first.mk 2009-01-30 07:40:14 UTC (rev 25156)
@@ -0,0 +1,4 @@
+ifeq ($(BR2_TARGET_LIBXML2),y)
+TARGETS+=libxml2
+endif
+
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-29 23:32:06 UTC (rev 25155)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-30 07:40:14 UTC (rev 25156)
@@ -15,17 +15,17 @@
DBUS_XML:=expat
# depend on the exact library file instead of expat so dbus isn't always
# considered out-of-date
-DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
# Makefile.autotools.in unfortunately has broken dependency handling,
# so we cannot do the same for libxml2
-DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
+DBUS_XML_DEP:=$(LIBXML2_HOOK_POST_INSTALL)
#libxml2-install-staging
endif
-DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
+
$(DL_DIR)/$(DBUS_SOURCE):
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
@@ -37,6 +37,7 @@
$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
(cd $(DBUS_DIR); rm -rf config.cache; \
+ echo "dbus is depending on $(DBUS_XML_DEP)"; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
ac_cv_have_abstract_sockets=yes \
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2009-01-29 23:32:06 UTC (rev 25155)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2009-01-30 07:40:14 UTC (rev 25156)
@@ -8,7 +8,7 @@
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
LIBXML2_INSTALL_STAGING = YES
LIBXML2_INSTALL_TARGET = YES
-
+LIBXML2_LIBTOOL_PATCH = NO
ifneq ($(BR2_LARGEFILE),y)
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
@@ -27,10 +27,21 @@
rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
touch $@
-$(LIBXML2_HOOK_POST_INSTALL):
+$(LIBXML2_HOOK_POST_INSTALL):\
+ $(LIBXML2_TARGET_SOURCE) \
+ $(LIBXML2_TARGET_EXTRACT) \
+ $(LIBXML2_HOOK_POST_EXTRACT) \
+ $(LIBXML2_TARGET_PATCH) \
+ $(LIBXML2_TARGET_AUTORECONF) \
+ $(LIBXML2_TARGET_CONFIGURE) \
+ $(LIBXML2_TARGET_LIBTOOL_PATCH) \
+ $(LIBXML2_TARGET_BUILD) \
+ $(LIBXML2_HOOK_POST_BUILD) \
+ $(LIBXML2_TARGET_INSTALL_STAGING)
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
rm -rf $(TARGET_DIR)/usr/share/aclocal \
$(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
$(TARGET_DIR)/usr/share/gtk-doc
touch $@
+
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
2009-01-30 7:40 [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2 ulf at uclibc.org
2009-01-30 8:27 ` Daniel James Laird
@ 2009-01-30 8:51 ` Peter Korsgaard
1 sibling, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2009-01-30 8:51 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-30 07:40:14 +0000 (Fri, 30 Jan 2009)
ulf> New Revision: 25156
ulf> Log:
ulf> Fix dbus dependency on libxml2, without rebuild, works but may need refinement
It sure looks like it does ;) What exactly is it you want to fix, and
why doesn't a normal dbus: libxml2 dependency work?
ulf> Added:
ulf> trunk/buildroot/package/0/
ulf> trunk/buildroot/package/0/0-run-first.mk
??
ulf> Changeset:
ulf> Added: trunk/buildroot/package/0/0-run-first.mk
ulf> ===================================================================
ulf> --- trunk/buildroot/package/0/0-run-first.mk (rev 0)
ulf> +++ trunk/buildroot/package/0/0-run-first.mk 2009-01-30 07:40:14 UTC (rev 25156)
ulf> @@ -0,0 +1,4 @@
ulf> +ifeq ($(BR2_TARGET_LIBXML2),y)
ulf> +TARGETS+=libxml2
ulf> +endif
ulf> +
??
ulf> Modified: trunk/buildroot/package/dbus/dbus.mk
ulf> ===================================================================
ulf> --- trunk/buildroot/package/dbus/dbus.mk 2009-01-29 23:32:06 UTC (rev 25155)
ulf> +++ trunk/buildroot/package/dbus/dbus.mk 2009-01-30 07:40:14 UTC (rev 25156)
ulf> @@ -15,17 +15,17 @@
ulf> DBUS_XML:=expat
ulf> # depend on the exact library file instead of expat so dbus isn't always
ulf> # considered out-of-date
ulf> -DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
ulf> +DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
ulf> else
ulf> DBUS_XML:=libxml
ulf> # Makefile.autotools.in unfortunately has broken dependency handling,
ulf> # so we cannot do the same for libxml2
ulf> -DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
ulf> +DBUS_XML_DEP:=$(LIBXML2_HOOK_POST_INSTALL)
Good, so that's what I asked you to revert.
ulf> #libxml2-install-staging
ulf> endif
ulf> -DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
ulf> +
ulf> $(DL_DIR)/$(DBUS_SOURCE):
ulf> $(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
ulf> @@ -37,6 +37,7 @@
ulf> $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
ulf> (cd $(DBUS_DIR); rm -rf config.cache; \
ulf> + echo "dbus is depending on $(DBUS_XML_DEP)"; \
Don't do that.
ulf> $(TARGET_CONFIGURE_OPTS) \
ulf> $(TARGET_CONFIGURE_ARGS) \
ulf> ac_cv_have_abstract_sockets=yes \
ulf> Modified: trunk/buildroot/package/libxml2/libxml2.mk
ulf> ===================================================================
ulf> --- trunk/buildroot/package/libxml2/libxml2.mk 2009-01-29 23:32:06 UTC (rev 25155)
ulf> +++ trunk/buildroot/package/libxml2/libxml2.mk 2009-01-30 07:40:14 UTC (rev 25156)
ulf> @@ -8,7 +8,7 @@
ulf> LIBXML2_SITE = ftp://xmlsoft.org/libxml2
ulf> LIBXML2_INSTALL_STAGING = YES
ulf> LIBXML2_INSTALL_TARGET = YES
ulf> -
ulf> +LIBXML2_LIBTOOL_PATCH = NO
Why?
ulf> -$(LIBXML2_HOOK_POST_INSTALL):
ulf> +$(LIBXML2_HOOK_POST_INSTALL):\
ulf> + $(LIBXML2_TARGET_SOURCE) \
ulf> + $(LIBXML2_TARGET_EXTRACT) \
ulf> + $(LIBXML2_HOOK_POST_EXTRACT) \
ulf> + $(LIBXML2_TARGET_PATCH) \
ulf> + $(LIBXML2_TARGET_AUTORECONF) \
ulf> + $(LIBXML2_TARGET_CONFIGURE) \
ulf> + $(LIBXML2_TARGET_LIBTOOL_PATCH) \
ulf> + $(LIBXML2_TARGET_BUILD) \
ulf> + $(LIBXML2_HOOK_POST_BUILD) \
ulf> + $(LIBXML2_TARGET_INSTALL_STAGING)
ulf> $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
ulf> $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
ulf> rm -rf $(TARGET_DIR)/usr/share/aclocal \
ulf> $(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
ulf> $(TARGET_DIR)/usr/share/gtk-doc
ulf> touch $@
ulf> +
Why?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
2009-01-30 8:27 ` Daniel James Laird
@ 2009-01-30 9:03 ` Ulf Samuelsson
2009-01-30 9:17 ` Peter Korsgaard
2009-01-30 9:22 ` Daniel James Laird
0 siblings, 2 replies; 9+ messages in thread
From: Ulf Samuelsson @ 2009-01-30 9:03 UTC (permalink / raw)
To: buildroot
fre 2009-01-30 klockan 09:27 +0100 skrev Daniel James Laird:
> How is the dependency checking broken? are you saying that if you build dbus with out XML2 support and then enable XML2 support DBUS does not rebuild?
> This does seems like a rather specific fix that fixes just packages that depend on LIBXML2.
>
> It seems that the changes to LIBXML2 rather spoil the point of Makefile.autotools.in which is to make the package makefiles as simple and common as possible.
>
The previous dependency did not work
There is a note in libxml2.mk that makefile.autotools dependencies are
broken.
Wihtout the fix, libxml2 is not built before dbus,
and a solution which continuously rebuilds libxml2
is also undesirable.
?With this fix dbus builds, but feel free to work on it.
both sam9261ek and sam9263ek broke because of this.
Try building one of these to test any fix
BR
Ulf Samuelsson
> Cheers
> Dan
>
> -----Original Message-----
> From: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] On Behalf Of ulf at uclibc.org
> Sent: 2009 Jan 30 07:40
> To: buildroot at uclibc.org
> Subject: [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
>
> Author: ulf
> Date: 2009-01-30 07:40:14 +0000 (Fri, 30 Jan 2009)
> New Revision: 25156
>
> Log:
> Fix dbus dependency on libxml2, without rebuild, works but may need refinement
>
> Added:
> trunk/buildroot/package/0/
> trunk/buildroot/package/0/0-run-first.mk
>
> Modified:
> trunk/buildroot/package/dbus/dbus.mk
> trunk/buildroot/package/libxml2/libxml2.mk
>
>
> Changeset:
> Added: trunk/buildroot/package/0/0-run-first.mk
> ===================================================================
> --- trunk/buildroot/package/0/0-run-first.mk (rev 0)
> +++ trunk/buildroot/package/0/0-run-first.mk 2009-01-30 07:40:14 UTC (rev 25156)
> @@ -0,0 +1,4 @@
> +ifeq ($(BR2_TARGET_LIBXML2),y)
> +TARGETS+=libxml2
> +endif
> +
>
> Modified: trunk/buildroot/package/dbus/dbus.mk
> ===================================================================
> --- trunk/buildroot/package/dbus/dbus.mk 2009-01-29 23:32:06 UTC (rev 25155)
> +++ trunk/buildroot/package/dbus/dbus.mk 2009-01-30 07:40:14 UTC (rev 25156)
> @@ -15,17 +15,17 @@
> DBUS_XML:=expat
> # depend on the exact library file instead of expat so dbus isn't always
> # considered out-of-date
> -DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> +DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> else
> DBUS_XML:=libxml
> # Makefile.autotools.in unfortunately has broken dependency handling,
> # so we cannot do the same for libxml2
> -DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
> +DBUS_XML_DEP:=$(LIBXML2_HOOK_POST_INSTALL)
> #libxml2-install-staging
> endif
>
> -DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
>
> +
> $(DL_DIR)/$(DBUS_SOURCE):
> $(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
>
> @@ -37,6 +37,7 @@
>
> $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
> (cd $(DBUS_DIR); rm -rf config.cache; \
> + echo "dbus is depending on $(DBUS_XML_DEP)"; \
> $(TARGET_CONFIGURE_OPTS) \
> $(TARGET_CONFIGURE_ARGS) \
> ac_cv_have_abstract_sockets=yes \
>
> Modified: trunk/buildroot/package/libxml2/libxml2.mk
> ===================================================================
> --- trunk/buildroot/package/libxml2/libxml2.mk 2009-01-29 23:32:06 UTC (rev 25155)
> +++ trunk/buildroot/package/libxml2/libxml2.mk 2009-01-30 07:40:14 UTC (rev 25156)
> @@ -8,7 +8,7 @@
> LIBXML2_SITE = ftp://xmlsoft.org/libxml2
> LIBXML2_INSTALL_STAGING = YES
> LIBXML2_INSTALL_TARGET = YES
> -
> +LIBXML2_LIBTOOL_PATCH = NO
> ifneq ($(BR2_LARGEFILE),y)
> LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
> endif
> @@ -27,10 +27,21 @@
> rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
> touch $@
>
> -$(LIBXML2_HOOK_POST_INSTALL):
> +$(LIBXML2_HOOK_POST_INSTALL):\
> + $(LIBXML2_TARGET_SOURCE) \
> + $(LIBXML2_TARGET_EXTRACT) \
> + $(LIBXML2_HOOK_POST_EXTRACT) \
> + $(LIBXML2_TARGET_PATCH) \
> + $(LIBXML2_TARGET_AUTORECONF) \
> + $(LIBXML2_TARGET_CONFIGURE) \
> + $(LIBXML2_TARGET_LIBTOOL_PATCH) \
> + $(LIBXML2_TARGET_BUILD) \
> + $(LIBXML2_HOOK_POST_BUILD) \
> + $(LIBXML2_TARGET_INSTALL_STAGING)
> $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
> $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
> rm -rf $(TARGET_DIR)/usr/share/aclocal \
> $(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
> $(TARGET_DIR)/usr/share/gtk-doc
> touch $@
> +
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
2009-01-30 9:03 ` Ulf Samuelsson
@ 2009-01-30 9:17 ` Peter Korsgaard
2009-01-30 17:57 ` Ulf Samuelsson
2009-01-30 9:22 ` Daniel James Laird
1 sibling, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2009-01-30 9:17 UTC (permalink / raw)
To: buildroot
>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
Hi,
Ulf> Wihtout the fix, libxml2 is not built before dbus,
Ulf> and a solution which continuously rebuilds libxml2
Ulf> is also undesirable.
Ulf> ?With this fix dbus builds, but feel free to work on it.
That's not how things work. You address the comments or revert the commit.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
2009-01-30 9:03 ` Ulf Samuelsson
2009-01-30 9:17 ` Peter Korsgaard
@ 2009-01-30 9:22 ` Daniel James Laird
2009-01-30 9:31 ` Peter Korsgaard
1 sibling, 1 reply; 9+ messages in thread
From: Daniel James Laird @ 2009-01-30 9:22 UTC (permalink / raw)
To: buildroot
I have looked at the dbus makefile and under the section
dbus: uclibc ......
should you not add libxml2 or expat with a check on if it is enabled or not.
I can see the comment in dbus.mk but it stil seems this is the only package that has done this fix. Usually you just add all the pkg dependencies to the packagename: ..... list and buildroot seems to get it right in all the packages I have built anyway, why is dbus different?
Is there no better way? (I am no make expert so maybe there is not)!
Cheers
With regards,
Daniel Laird
-----Original Message-----
From: Ulf Samuelsson [mailto:ulf.samuelsson at atmel.com]
Sent: 2009 Jan 30 09:03
To: Daniel James Laird
Cc: buildroot at uclibc.org
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
fre 2009-01-30 klockan 09:27 +0100 skrev Daniel James Laird:
> How is the dependency checking broken? are you saying that if you build dbus with out XML2 support and then enable XML2 support DBUS does not rebuild?
> This does seems like a rather specific fix that fixes just packages that depend on LIBXML2.
>
> It seems that the changes to LIBXML2 rather spoil the point of Makefile.autotools.in which is to make the package makefiles as simple and common as possible.
>
The previous dependency did not work
There is a note in libxml2.mk that makefile.autotools dependencies are
broken.
Wihtout the fix, libxml2 is not built before dbus,
and a solution which continuously rebuilds libxml2
is also undesirable.
?With this fix dbus builds, but feel free to work on it.
both sam9261ek and sam9263ek broke because of this.
Try building one of these to test any fix
BR
Ulf Samuelsson
> Cheers
> Dan
>
> -----Original Message-----
> From: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] On Behalf Of ulf at uclibc.org
> Sent: 2009 Jan 30 07:40
> To: buildroot at uclibc.org
> Subject: [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
>
> Author: ulf
> Date: 2009-01-30 07:40:14 +0000 (Fri, 30 Jan 2009)
> New Revision: 25156
>
> Log:
> Fix dbus dependency on libxml2, without rebuild, works but may need refinement
>
> Added:
> trunk/buildroot/package/0/
> trunk/buildroot/package/0/0-run-first.mk
>
> Modified:
> trunk/buildroot/package/dbus/dbus.mk
> trunk/buildroot/package/libxml2/libxml2.mk
>
>
> Changeset:
> Added: trunk/buildroot/package/0/0-run-first.mk
> ===================================================================
> --- trunk/buildroot/package/0/0-run-first.mk (rev 0)
> +++ trunk/buildroot/package/0/0-run-first.mk 2009-01-30 07:40:14 UTC (rev 25156)
> @@ -0,0 +1,4 @@
> +ifeq ($(BR2_TARGET_LIBXML2),y)
> +TARGETS+=libxml2
> +endif
> +
>
> Modified: trunk/buildroot/package/dbus/dbus.mk
> ===================================================================
> --- trunk/buildroot/package/dbus/dbus.mk 2009-01-29 23:32:06 UTC (rev 25155)
> +++ trunk/buildroot/package/dbus/dbus.mk 2009-01-30 07:40:14 UTC (rev 25156)
> @@ -15,17 +15,17 @@
> DBUS_XML:=expat
> # depend on the exact library file instead of expat so dbus isn't always
> # considered out-of-date
> -DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> +DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> else
> DBUS_XML:=libxml
> # Makefile.autotools.in unfortunately has broken dependency handling,
> # so we cannot do the same for libxml2
> -DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
> +DBUS_XML_DEP:=$(LIBXML2_HOOK_POST_INSTALL)
> #libxml2-install-staging
> endif
>
> -DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
>
> +
> $(DL_DIR)/$(DBUS_SOURCE):
> $(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
>
> @@ -37,6 +37,7 @@
>
> $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
> (cd $(DBUS_DIR); rm -rf config.cache; \
> + echo "dbus is depending on $(DBUS_XML_DEP)"; \
> $(TARGET_CONFIGURE_OPTS) \
> $(TARGET_CONFIGURE_ARGS) \
> ac_cv_have_abstract_sockets=yes \
>
> Modified: trunk/buildroot/package/libxml2/libxml2.mk
> ===================================================================
> --- trunk/buildroot/package/libxml2/libxml2.mk 2009-01-29 23:32:06 UTC (rev 25155)
> +++ trunk/buildroot/package/libxml2/libxml2.mk 2009-01-30 07:40:14 UTC (rev 25156)
> @@ -8,7 +8,7 @@
> LIBXML2_SITE = ftp://xmlsoft.org/libxml2
> LIBXML2_INSTALL_STAGING = YES
> LIBXML2_INSTALL_TARGET = YES
> -
> +LIBXML2_LIBTOOL_PATCH = NO
> ifneq ($(BR2_LARGEFILE),y)
> LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
> endif
> @@ -27,10 +27,21 @@
> rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
> touch $@
>
> -$(LIBXML2_HOOK_POST_INSTALL):
> +$(LIBXML2_HOOK_POST_INSTALL):\
> + $(LIBXML2_TARGET_SOURCE) \
> + $(LIBXML2_TARGET_EXTRACT) \
> + $(LIBXML2_HOOK_POST_EXTRACT) \
> + $(LIBXML2_TARGET_PATCH) \
> + $(LIBXML2_TARGET_AUTORECONF) \
> + $(LIBXML2_TARGET_CONFIGURE) \
> + $(LIBXML2_TARGET_LIBTOOL_PATCH) \
> + $(LIBXML2_TARGET_BUILD) \
> + $(LIBXML2_HOOK_POST_BUILD) \
> + $(LIBXML2_TARGET_INSTALL_STAGING)
> $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
> $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
> rm -rf $(TARGET_DIR)/usr/share/aclocal \
> $(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
> $(TARGET_DIR)/usr/share/gtk-doc
> touch $@
> +
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
2009-01-30 9:22 ` Daniel James Laird
@ 2009-01-30 9:31 ` Peter Korsgaard
0 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2009-01-30 9:31 UTC (permalink / raw)
To: buildroot
>>>>> "Daniel" == Daniel James Laird <daniel.j.laird@nxp.com> writes:
Daniel> I have looked at the dbus makefile and under the section
Daniel> dbus: uclibc ......
Daniel> should you not add libxml2 or expat with a check on if it is enabled or not.
Daniel> I can see the comment in dbus.mk but it stil seems this is
Daniel> the only package that has done this fix. Usually you just
Daniel> add all the pkg dependencies to the packagename: ..... list
Daniel> and buildroot seems to get it right in all the packages I
Daniel> have built anyway, why is dbus different?
I added that comment long time ago as part of trying to get the
dependencies right to run the top level makefile with stuff in
parallel (-jX). We are not doing that (and it would take quite some
work to get there), so it can be ignored.
I would also think that simply adding expat/libxml to the dbus:
dependency would be enough,
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
@ 2009-01-30 13:54 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2009-01-30 13:54 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-30 13:54:42 +0000 (Fri, 30 Jan 2009)
New Revision: 25167
Log:
dbus: revert r25156 (Fix dbus dependency on libxml2, without rebuild, works but may need refinement)
As discussed on the list - Too complicated and wrong.
Removed:
trunk/buildroot/package/0/0-run-first.mk
Modified:
trunk/buildroot/package/dbus/dbus.mk
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Deleted: trunk/buildroot/package/0/0-run-first.mk
===================================================================
--- trunk/buildroot/package/0/0-run-first.mk 2009-01-30 13:34:42 UTC (rev 25166)
+++ trunk/buildroot/package/0/0-run-first.mk 2009-01-30 13:54:42 UTC (rev 25167)
@@ -1,4 +0,0 @@
-ifeq ($(BR2_TARGET_LIBXML2),y)
-TARGETS+=libxml2
-endif
-
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-30 13:34:42 UTC (rev 25166)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-30 13:54:42 UTC (rev 25167)
@@ -15,17 +15,17 @@
DBUS_XML:=expat
# depend on the exact library file instead of expat so dbus isn't always
# considered out-of-date
-DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
# Makefile.autotools.in unfortunately has broken dependency handling,
# so we cannot do the same for libxml2
-DBUS_XML_DEP:=$(LIBXML2_HOOK_POST_INSTALL)
+DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
#libxml2-install-staging
endif
+DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
-
$(DL_DIR)/$(DBUS_SOURCE):
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
@@ -37,7 +37,6 @@
$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
(cd $(DBUS_DIR); rm -rf config.cache; \
- echo "dbus is depending on $(DBUS_XML_DEP)"; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
ac_cv_have_abstract_sockets=yes \
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2009-01-30 13:34:42 UTC (rev 25166)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2009-01-30 13:54:42 UTC (rev 25167)
@@ -8,7 +8,7 @@
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
LIBXML2_INSTALL_STAGING = YES
LIBXML2_INSTALL_TARGET = YES
-LIBXML2_LIBTOOL_PATCH = NO
+
ifneq ($(BR2_LARGEFILE),y)
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
@@ -27,21 +27,10 @@
rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
touch $@
-$(LIBXML2_HOOK_POST_INSTALL):\
- $(LIBXML2_TARGET_SOURCE) \
- $(LIBXML2_TARGET_EXTRACT) \
- $(LIBXML2_HOOK_POST_EXTRACT) \
- $(LIBXML2_TARGET_PATCH) \
- $(LIBXML2_TARGET_AUTORECONF) \
- $(LIBXML2_TARGET_CONFIGURE) \
- $(LIBXML2_TARGET_LIBTOOL_PATCH) \
- $(LIBXML2_TARGET_BUILD) \
- $(LIBXML2_HOOK_POST_BUILD) \
- $(LIBXML2_TARGET_INSTALL_STAGING)
+$(LIBXML2_HOOK_POST_INSTALL):
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
rm -rf $(TARGET_DIR)/usr/share/aclocal \
$(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
$(TARGET_DIR)/usr/share/gtk-doc
touch $@
-
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
2009-01-30 9:17 ` Peter Korsgaard
@ 2009-01-30 17:57 ` Ulf Samuelsson
0 siblings, 0 replies; 9+ messages in thread
From: Ulf Samuelsson @ 2009-01-30 17:57 UTC (permalink / raw)
To: buildroot
fre 2009-01-30 klockan 10:17 +0100 skrev Peter Korsgaard:
> >>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
>
> Hi,
>
> Ulf> Wihtout the fix, libxml2 is not built before dbus,
> Ulf> and a solution which continuously rebuilds libxml2
> Ulf> is also undesirable.
>
> Ulf> ?With this fix dbus builds, but feel free to work on it.
>
> That's not how things work. You address the comments or revert the commit.
>
Just a time issue.
I had to leave for some other things at that point.
It has been updated by now, I see.
BR
Ulf Samuelsson
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-01-30 17:57 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-30 7:40 [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2 ulf at uclibc.org
2009-01-30 8:27 ` Daniel James Laird
2009-01-30 9:03 ` Ulf Samuelsson
2009-01-30 9:17 ` Peter Korsgaard
2009-01-30 17:57 ` Ulf Samuelsson
2009-01-30 9:22 ` Daniel James Laird
2009-01-30 9:31 ` Peter Korsgaard
2009-01-30 8:51 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2009-01-30 13:54 jacmet 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