Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package: 0 dbus libxml2
Date: Fri, 30 Jan 2009 09:51:17 +0100	[thread overview]
Message-ID: <878wotp46y.fsf@macbook.be.48ers.dk> (raw)
In-Reply-To: <20090130074016.0A323765E9@busybox.osuosl.org> (ulf@uclibc.org's message of "Fri\, 30 Jan 2009 07\:40\:15 +0000 \(UTC\)")

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

  parent reply	other threads:[~2009-01-30  8:51 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-01-30 13:54 jacmet at uclibc.org

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878wotp46y.fsf@macbook.be.48ers.dk \
    --to=jacmet@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox