Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/xerces
@ 2009-01-16 13:27 jacmet at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: jacmet at uclibc.org @ 2009-01-16 13:27 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2009-01-16 13:27:08 +0000 (Fri, 16 Jan 2009)
New Revision: 24878

Log:
xerces: tarball moved to archive.apache.org

Modified:
   trunk/buildroot/package/xerces/xerces.mk


Changeset:
Modified: trunk/buildroot/package/xerces/xerces.mk
===================================================================
--- trunk/buildroot/package/xerces/xerces.mk	2009-01-16 13:23:56 UTC (rev 24877)
+++ trunk/buildroot/package/xerces/xerces.mk	2009-01-16 13:27:08 UTC (rev 24878)
@@ -5,7 +5,7 @@
 #############################################################
 XERCES_VERSION:=2.7.0
 XERCES_SOURCE:=xerces-c-src_2_7_0.tar.gz
-XERCES_SITE:=http://www.apache.org/dist/xml/xerces-c/source/
+XERCES_SITE:=http://archive.apache.org/dist/xml/xerces-c/source/
 XERCES_CAT:=$(ZCAT)
 XERCES_DIR:=$(BUILD_DIR)/xerces-c-src_2_7_0
 XERCES_BINARY:=lib/libxerces-c.so.27.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/xerces
@ 2009-01-20 21:34 ulf at uclibc.org
  2009-01-20 22:34 ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: ulf at uclibc.org @ 2009-01-20 21:34 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2009-01-20 21:34:46 +0000 (Tue, 20 Jan 2009)
New Revision: 24928

Log:
Bump xerces-c to latest stable, ARM build now completes

Modified:
   trunk/buildroot/package/xerces/Config.in
   trunk/buildroot/package/xerces/xerces.mk


Changeset:
Modified: trunk/buildroot/package/xerces/Config.in
===================================================================
--- trunk/buildroot/package/xerces/Config.in	2009-01-20 21:33:57 UTC (rev 24927)
+++ trunk/buildroot/package/xerces/Config.in	2009-01-20 21:34:46 UTC (rev 24928)
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XERCES
-	bool "xerces"
+	bool "xerces-c++"
+	select BR2_PACKAGE_LIBICONV
 	help
 	  Xerces-C++ is a validating XML parser written in portable C++.
 

Modified: trunk/buildroot/package/xerces/xerces.mk
===================================================================
--- trunk/buildroot/package/xerces/xerces.mk	2009-01-20 21:33:57 UTC (rev 24927)
+++ trunk/buildroot/package/xerces/xerces.mk	2009-01-20 21:34:46 UTC (rev 24928)
@@ -3,13 +3,42 @@
 # xerces
 #
 #############################################################
-XERCES_VERSION:=2.7.0
-XERCES_SOURCE:=xerces-c-src_2_7_0.tar.gz
-XERCES_SITE:=http://archive.apache.org/dist/xml/xerces-c/source/
+XERCES_VERSION:=3.0.0
+XERCES_SOURCE:=xerces-c-$(XERCES_VERSION).tar.gz
+XERCES_SITE:=http://apache.jumper.nu/xerces/c/3/sources/
 XERCES_CAT:=$(ZCAT)
-XERCES_DIR:=$(BUILD_DIR)/xerces-c-src_2_7_0
-XERCES_BINARY:=lib/libxerces-c.so.27.0
+XERCES_DIR:=$(BUILD_DIR)/xerces-c-$(XERCES_VERSION)
+LIBXERCES_BINARY:=libxerces-c-3.0.so
 
+# XERCES-C will install a number of applications
+# in $(STAGING_DIR)/usr/bin
+# We may want to copy these to the target
+
+XERCES_APPS:= \
+	CreateDOMDocument	\
+	DOMCount		\
+	DOMPrint		\
+	EnumVal			\
+	MemParse		\
+	PParse			\
+	PSVIWriter		\
+	Redirect		\
+	SAX2Count		\
+	SAX2Print		\
+	SAXCount		\
+	SAXPrint		\
+	SCMPrint		\
+	SEnumVal		\
+	StdInParse
+
+# XERCES-C installs a 4.2MB worth of "*.hpp" files
+# in the
+#	"dom", "framework", "internal", "parsers",
+#	"sax", "sax2", "util", "validators", "xinclude"
+# directories
+
+XERCES_INCLUDES:=/usr/include/xercesc
+
 $(DL_DIR)/$(XERCES_SOURCE):
 	 $(call DOWNLOAD,$(XERCES_SITE),$(XERCES_SOURCE))
 
@@ -20,31 +49,52 @@
 # toolchain/patch-kernel.sh $(XERCES_DIR) package/xerces/ \*.patch*
 	touch $(XERCES_DIR)/.unpacked
 
+#	Support for the following should be added later
+#		--with-curl=
+#		--with-icu=
+#		--with-pkgconfigdir=
+
 $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
-	(cd $(XERCES_DIR)/src/xercesc; rm -rf config.cache; \
+	(cd $(XERCES_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		XERCESCROOT=$(XERCES_DIR) \
-		./runConfigure -plinux -minmem \
-		-nsocket -tnative -rpthread \
-		-c$(TARGET_CC) -x$(TARGET_CXX) \
+		./configure		\
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr		\
+		--libdir=/usr/lib	\
+		--libexecdir=/usr/lib	\
+		--sysconfdir=/etc	\
+		--localstatedir=/var	\
+		--enable-shared		\
+		--disable-threads	\
+		--disable-network	\
+		--with-gnu-ld		\
 	)
-	touch $(XERCES_DIR)/.configured
+	touch $@
 
-$(XERCES_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/.configured
-	$(MAKE) XERCESCROOT=$(XERCES_DIR) -C $(XERCES_DIR)/src/xercesc
+$(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY): $(XERCES_DIR)/.configured
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBS="-liconv" -C $(XERCES_DIR)
 
-$(STAGING_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/$(XERCES_BINARY)
-	$(MAKE) XERCESCROOT=$(XERCES_DIR) PREFIX=$(STAGING_DIR) \
-		-C $(XERCES_DIR)/src/xercesc install
+$(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY): $(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \
+		-C $(XERCES_DIR) install
+	$(INSTALL) -c $(XERCES_DIR)/src/.libs/libxerces-c.lai	\
+		$(STAGING_DIR)/usr/lib/libxerces-c.la
+	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libxerces-c.la
 
-$(TARGET_DIR)/usr/$(XERCES_BINARY): $(STAGING_DIR)/$(XERCES_BINARY)
-	cp -a $(STAGING_DIR)/lib/libxerces-c.so* $(TARGET_DIR)/usr/lib
-	cp -a $(STAGING_DIR)/lib/libxerces-depdom.so* $(TARGET_DIR)/usr/lib
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-c.so.27.0
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-depdom.so.27.0
+$(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY): $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
+	cp -a $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)* $(TARGET_DIR)/usr/lib
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
 
-xerces: uclibc $(TARGET_DIR)/usr/$(XERCES_BINARY)
+xerces: uclibc $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
 
+xerces-bin: $(XERCES_DIR)/usr/lib/$(LIBXERCES_BINARY)
+
+xerces-tbin: $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
+
+xerces-unpacked: $(XERCES_DIR)/.unpacked
+
 xerces-clean:
 	rm -rf $(STAGING_DIR)/usr/include/xercesc
 	rm -f $(STAGING_DIR)/lib/libxerces*

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/xerces
  2009-01-20 21:34 [Buildroot] svn commit: trunk/buildroot/package/xerces ulf at uclibc.org
@ 2009-01-20 22:34 ` Peter Korsgaard
  2009-01-21  7:31   ` Ulf Samuelsson
  0 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2009-01-20 22:34 UTC (permalink / raw)
  To: buildroot

>>>>> "ulf" == ulf  <ulf@uclibc.org> writes:

 ulf> Author: ulf
 ulf> Date: 2009-01-20 21:34:46 +0000 (Tue, 20 Jan 2009)
 ulf> New Revision: 24928

 ulf> Log:
 ulf> Bump xerces-c to latest stable, ARM build now completes

 ulf> Modified:
 ulf>    trunk/buildroot/package/xerces/Config.in
 ulf>    trunk/buildroot/package/xerces/xerces.mk

How about converting to Makefile.autotools.in format while you're at
it?

 ulf> +xerces-unpacked: $(XERCES_DIR)/.unpacked
 ulf> +
 ulf>  xerces-clean:
 ulf>  	rm -rf $(STAGING_DIR)/usr/include/xercesc
 ulf>  	rm -f $(STAGING_DIR)/lib/libxerces*

TARGET_DIR cleanup stuff seems to be missing.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/xerces
  2009-01-20 22:34 ` Peter Korsgaard
@ 2009-01-21  7:31   ` Ulf Samuelsson
  2009-01-21 12:25     ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Ulf Samuelsson @ 2009-01-21  7:31 UTC (permalink / raw)
  To: buildroot

tis 2009-01-20 klockan 23:34 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf  <ulf@uclibc.org> writes:
> 
>  ulf> Author: ulf
>  ulf> Date: 2009-01-20 21:34:46 +0000 (Tue, 20 Jan 2009)
>  ulf> New Revision: 24928
> 
>  ulf> Log:
>  ulf> Bump xerces-c to latest stable, ARM build now completes
> 
>  ulf> Modified:
>  ulf>    trunk/buildroot/package/xerces/Config.in
>  ulf>    trunk/buildroot/package/xerces/xerces.mk
> 
> How about converting to Makefile.autotools.in format while you're at
> it?

I think my priority is to get things to build at all.

Once all packages build, then it will not be hard
to get most of them into Makefile.autotools.in 

BTW: Makefile.autotools.in does not support compressed
patches *.patch.gz, *.patch.bz2, is that intentional?

BR
Ulf Samuelsson

>  ulf> +xerces-unpacked: $(XERCES_DIR)/.unpacked
>  ulf> +
>  ulf>  xerces-clean:
>  ulf>  	rm -rf $(STAGING_DIR)/usr/include/xercesc
>  ulf>  	rm -f $(STAGING_DIR)/lib/libxerces*
> 
> TARGET_DIR cleanup stuff seems to be missing.
> 

OK, Have a look at it later.
BR
Ulf Samuelsson

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/xerces
  2009-01-21  7:31   ` Ulf Samuelsson
@ 2009-01-21 12:25     ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2009-01-21 12:25 UTC (permalink / raw)
  To: buildroot

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

Hi,

 >> How about converting to Makefile.autotools.in format while you're at
 >> it?

 Ulf> I think my priority is to get things to build at all.

Then why were you doing cleanups as well in that commit?
Purely cosmetic cleanups to packages that should be converted to
Makefile.autotools.in seems kind of silly to me - But anyway.

 Ulf> Once all packages build, then it will not be hard
 Ulf> to get most of them into Makefile.autotools.in 

 Ulf> BTW: Makefile.autotools.in does not support compressed
 Ulf> patches *.patch.gz, *.patch.bz2, is that intentional?

Why should it?

find package/ -name '*patch.?z*'

We don't have such files, and for most patches in BR (with the
possible exception of those unfortunate avr32 patches) I don't think
compression will buy us much.

 ulf> xerces-clean:
 ulf> rm -rf $(STAGING_DIR)/usr/include/xercesc
 ulf> rm -f $(STAGING_DIR)/lib/libxerces*
 >> 
 >> TARGET_DIR cleanup stuff seems to be missing.

 Ulf> OK, Have a look at it later.

Thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2009-01-21 12:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-20 21:34 [Buildroot] svn commit: trunk/buildroot/package/xerces ulf at uclibc.org
2009-01-20 22:34 ` Peter Korsgaard
2009-01-21  7:31   ` Ulf Samuelsson
2009-01-21 12:25     ` Peter Korsgaard
  -- strict thread matches above, loose matches on Subject: below --
2009-01-16 13:27 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