* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-01-15 21:27 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-15 21:27 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-15 13:27:17 -0800 (Mon, 15 Jan 2007)
New Revision: 17316
Log:
lose the extra space
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-01-15 21:26:43 UTC (rev 17315)
+++ trunk/buildroot/package/expat/expat.mk 2007-01-15 21:27:17 UTC (rev 17316)
@@ -5,7 +5,6 @@
#############################################################
EXPAT_VERSION=2.0.0
-
EXPAT_SOURCE=expat-$(EXPAT_VERSION).tar.gz
EXPAT_CAT:=$(ZCAT)
EXPAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2008-06-13 13:31 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2008-06-13 13:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-13 06:31:41 -0700 (Fri, 13 Jun 2008)
New Revision: 22322
Log:
expat: make sure usr/lib/ exists
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2008-06-13 13:20:38 UTC (rev 22321)
+++ trunk/buildroot/package/expat/expat.mk 2008-06-13 13:31:41 UTC (rev 22322)
@@ -52,6 +52,7 @@
touch -c $@
$(TARGET_DIR)/$(EXPAT_TARGET_BINARY): $(STAGING_DIR)/$(EXPAT_TARGET_BINARY)
+ mkdir -p $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/lib/libexpat.so* $(TARGET_DIR)/usr/lib/
#cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libexpat.so*
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2008-04-24 14:04 ninevoltz at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 14:04 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 07:04:23 -0700 (Thu, 24 Apr 2008)
New Revision: 21841
Log:
revert commit 21832
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2008-04-24 13:26:25 UTC (rev 21840)
+++ trunk/buildroot/package/expat/expat.mk 2008-04-24 14:04:23 UTC (rev 21841)
@@ -35,16 +35,8 @@
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
- --bindir=/bin \
- --sbindir=/sbin \
- --libdir=/lib \
- --libexecdir=/lib \
--sysconfdir=/etc \
- --datadir=/share \
--localstatedir=/var \
- --includedir=/include \
- --mandir=/man \
- --infodir=/info \
--enable-shared \
)
touch $@
@@ -54,7 +46,7 @@
touch -c $@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2008-04-24 13:15 ninevoltz at uclibc.org
2008-04-24 13:18 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 16+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 13:15 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 06:15:30 -0700 (Thu, 24 Apr 2008)
New Revision: 21832
Log:
more options for expat, move install to /usr
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2008-04-24 13:14:25 UTC (rev 21831)
+++ trunk/buildroot/package/expat/expat.mk 2008-04-24 13:15:30 UTC (rev 21832)
@@ -35,8 +35,16 @@
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
+ --bindir=/bin \
+ --sbindir=/sbin \
+ --libdir=/lib \
+ --libexecdir=/lib \
--sysconfdir=/etc \
+ --datadir=/share \
--localstatedir=/var \
+ --includedir=/include \
+ --mandir=/man \
+ --infodir=/info \
--enable-shared \
)
touch $@
@@ -46,7 +54,7 @@
touch -c $@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
+ $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
2008-04-24 13:15 ninevoltz at uclibc.org
@ 2008-04-24 13:18 ` Hans-Christian Egtvedt
2008-04-24 13:38 ` John Voltz
0 siblings, 1 reply; 16+ messages in thread
From: Hans-Christian Egtvedt @ 2008-04-24 13:18 UTC (permalink / raw)
To: buildroot
On Thu, 2008-04-24 at 06:15 -0700, ninevoltz at uclibc.org wrote:
> Author: ninevoltz
> Date: 2008-04-24 06:15:30 -0700 (Thu, 24 Apr 2008)
> New Revision: 21832
>
> Log:
> more options for expat, move install to /usr
>
From what I can see, that was the default before this patch.
> Modified:
> trunk/buildroot/package/expat/expat.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/expat/expat.mk
> ===================================================================
> --- trunk/buildroot/package/expat/expat.mk 2008-04-24 13:14:25 UTC (rev 21831)
> +++ trunk/buildroot/package/expat/expat.mk 2008-04-24 13:15:30 UTC (rev 21832)
> @@ -35,8 +35,16 @@
> --build=$(GNU_HOST_NAME) \
> --prefix=/usr \
> --exec-prefix=/usr \
> + --bindir=/bin \
> + --sbindir=/sbin \
> + --libdir=/lib \
> + --libexecdir=/lib \
> --sysconfdir=/etc \
> + --datadir=/share \
> --localstatedir=/var \
> + --includedir=/include \
> + --mandir=/man \
> + --infodir=/info \
These +'s seems very wrong, the --prefix should take care of that.
> --enable-shared \
> )
> touch $@
> @@ -46,7 +54,7 @@
> touch -c $@
>
> $(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
> - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
> + $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
This is due to you override the prefix during configure.
Did the ./configure --prefix stuff not work? I usually only specify
--prefix=/usr, --sysconfdir=/etc and -localstatedir=/var.
then do make DESTDIR=$(STAGING_DIR) install.
> $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
> $(STAGING_DIR)/usr/lib/libexpat.la
> touch -c $@
--
With kind regards,
Hans-Christian Egtvedt, Applications Engineer
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
2008-04-24 13:18 ` Hans-Christian Egtvedt
@ 2008-04-24 13:38 ` John Voltz
2008-04-24 13:49 ` Peter Korsgaard
0 siblings, 1 reply; 16+ messages in thread
From: John Voltz @ 2008-04-24 13:38 UTC (permalink / raw)
To: buildroot
I'm attempting to sync up our Google Code buildroot changes with the uClibc
buildroot. I'm having a little difficulty determining who's changes are the
"best" changes. A lot of stuff has changed or been added to both in the last
few weeks. Do you recommend that I revert this expat commit? I think I'll
start pulling the commit logs and looking them over now before I continue.
John
On Thu, Apr 24, 2008 at 9:18 AM, Hans-Christian Egtvedt <
hans-christian.egtvedt@atmel.com> wrote:
> On Thu, 2008-04-24 at 06:15 -0700, ninevoltz at uclibc.org wrote:
> > Author: ninevoltz
> > Date: 2008-04-24 06:15:30 -0700 (Thu, 24 Apr 2008)
> > New Revision: 21832
> >
> > Log:
> > more options for expat, move install to /usr
> >
>
> >From what I can see, that was the default before this patch.
>
> > Modified:
> > trunk/buildroot/package/expat/expat.mk
> >
> >
> > Changeset:
> > Modified: trunk/buildroot/package/expat/expat.mk
> > ===================================================================
> > --- trunk/buildroot/package/expat/expat.mk 2008-04-24 13:14:25 UTC
> (rev 21831)
> > +++ trunk/buildroot/package/expat/expat.mk 2008-04-24 13:15:30 UTC
> (rev 21832)
> > @@ -35,8 +35,16 @@
> > --build=$(GNU_HOST_NAME) \
> > --prefix=/usr \
> > --exec-prefix=/usr \
> > + --bindir=/bin \
> > + --sbindir=/sbin \
> > + --libdir=/lib \
> > + --libexecdir=/lib \
> > --sysconfdir=/etc \
> > + --datadir=/share \
> > --localstatedir=/var \
> > + --includedir=/include \
> > + --mandir=/man \
> > + --infodir=/info \
>
> These +'s seems very wrong, the --prefix should take care of that.
>
> > --enable-shared \
> > )
> > touch $@
> > @@ -46,7 +54,7 @@
> > touch -c $@
> >
> > $(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
> > - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
> > + $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
>
> This is due to you override the prefix during configure.
>
> Did the ./configure --prefix stuff not work? I usually only specify
> --prefix=/usr, --sysconfdir=/etc and -localstatedir=/var.
>
> then do make DESTDIR=$(STAGING_DIR) install.
>
> > $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
> > $(STAGING_DIR)/usr/lib/libexpat.la
> > touch -c $@
>
> --
> With kind regards,
> Hans-Christian Egtvedt, Applications Engineer
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080424/db9fd414/attachment.htm
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
2008-04-24 13:38 ` John Voltz
@ 2008-04-24 13:49 ` Peter Korsgaard
0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2008-04-24 13:49 UTC (permalink / raw)
To: buildroot
>>>>> "John" == John Voltz <john.voltz@gmail.com> writes:
John> I'm attempting to sync up our Google Code buildroot changes
John> with the uClibc buildroot. I'm having a little difficulty
John> determining who's changes are the "best" changes. A lot of
John> stuff has changed or been added to both in the last few
John> weeks. Do you recommend that I revert this expat commit? I
John> think I'll start pulling the commit logs and looking them over
John> now before I continue.
Yes, please do. My cleanups to expat are correct.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2008-03-31 20:09 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2008-03-31 20:09 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-31 13:09:06 -0700 (Mon, 31 Mar 2008)
New Revision: 21602
Log:
expat: cleanup configure arguments
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2008-03-31 19:56:58 UTC (rev 21601)
+++ trunk/buildroot/package/expat/expat.mk 2008-03-31 20:09:06 UTC (rev 21602)
@@ -35,16 +35,8 @@
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
- --bindir=/bin \
- --sbindir=/sbin \
- --libdir=/lib \
- --libexecdir=/lib \
--sysconfdir=/etc \
- --datadir=/share \
--localstatedir=/var \
- --includedir=/include \
- --mandir=/man \
- --infodir=/info \
--enable-shared \
)
touch $@
@@ -54,7 +46,7 @@
touch -c $@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-08-12 14:13 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-08-12 14:13 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-12 07:13:39 -0700 (Sun, 12 Aug 2007)
New Revision: 19462
Log:
expat has --prefix=usr, so remove /usr from other switches
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-08-12 14:11:02 UTC (rev 19461)
+++ trunk/buildroot/package/expat/expat.mk 2007-08-12 14:13:39 UTC (rev 19462)
@@ -34,16 +34,16 @@
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
+ --bindir=/bin \
+ --sbindir=/sbin \
--libdir=/lib \
- --libexecdir=/usr/lib \
+ --libexecdir=/lib \
--sysconfdir=/etc \
- --datadir=/usr/share \
+ --datadir=/share \
--localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
+ --includedir=/include \
+ --mandir=/man \
+ --infodir=/info \
--enable-shared \
);
touch $@
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-08-11 23:03 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 23:03 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-11 16:03:04 -0700 (Sat, 11 Aug 2007)
New Revision: 19445
Log:
Use STAGING_DIR/usr/lib instead of STAGING_DIR/lib for expat
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-08-11 22:26:56 UTC (rev 19444)
+++ trunk/buildroot/package/expat/expat.mk 2007-08-11 23:03:04 UTC (rev 19445)
@@ -53,7 +53,7 @@
touch -c $@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
+ $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-08-11 18:25 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 18:25 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-11 11:25:17 -0700 (Sat, 11 Aug 2007)
New Revision: 19432
Log:
Use correct DEST_DIR for expat
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-08-11 17:03:04 UTC (rev 19431)
+++ trunk/buildroot/package/expat/expat.mk 2007-08-11 18:25:17 UTC (rev 19432)
@@ -53,7 +53,7 @@
touch -c $@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
$(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-07-08 13:55 aldot at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 13:55 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-08 06:55:49 -0700 (Sun, 08 Jul 2007)
New Revision: 19038
Log:
- add missing dirclean target (Cristian Ionescu-Idbohrn)
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-07-08 13:51:15 UTC (rev 19037)
+++ trunk/buildroot/package/expat/expat.mk 2007-07-08 13:55:49 UTC (rev 19038)
@@ -19,7 +19,8 @@
expat-source: $(DL_DIR)/$(EXPAT_SOURCE)
$(EXPAT_DIR)/.unpacked: $(DL_DIR)/$(EXPAT_SOURCE)
- $(EXPAT_CAT) $(DL_DIR)/$(EXPAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(EXPAT_CAT) $(DL_DIR)/$(EXPAT_SOURCE) | \
+ tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(CONFIG_UPDATE) $(EXPAT_DIR)
touch $@
@@ -40,7 +41,7 @@
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
@@ -53,7 +54,8 @@
$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libexpat.la
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
+ $(STAGING_DIR)/usr/lib/libexpat.la
touch -c $@
$(TARGET_DIR)/$(EXPAT_TARGET_BINARY): $(STAGING_DIR)/$(EXPAT_TARGET_BINARY)
@@ -66,10 +68,14 @@
expat-clean:
rm -f $(EXPAT_DIR)/.configured
- rm -f $(STAGING_DIR)/usr/lib/libexpat.* $(TARGET_DIR)/usr/lib/libexpat.*
+ rm -f $(STAGING_DIR)/usr/lib/libexpat.* \
+ $(TARGET_DIR)/usr/lib/libexpat.*
#rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf
-$(MAKE) -C $(EXPAT_DIR) clean
+expat-dirclean:
+ rm -rf $(EXPAT_DIR)
+
#############################################################
#
# Toplevel Makefile options
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-06-25 8:37 aldot at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 8:37 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 01:37:23 -0700 (Mon, 25 Jun 2007)
New Revision: 18910
Log:
- bump version and correct install dirs (Julien Letessier)
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-06-25 08:16:14 UTC (rev 18909)
+++ trunk/buildroot/package/expat/expat.mk 2007-06-25 08:37:23 UTC (rev 18910)
@@ -4,12 +4,15 @@
#
#############################################################
-EXPAT_VERSION=2.0.0
+EXPAT_VERSION=2.0.1
EXPAT_SOURCE=expat-$(EXPAT_VERSION).tar.gz
EXPAT_CAT:=$(ZCAT)
EXPAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
EXPAT_DIR:=$(BUILD_DIR)/expat-$(EXPAT_VERSION)
+EXPAT_BINARY:=.libs/libexpat.a
+EXPAT_TARGET_BINARY:=usr/lib/libexpat.so.1
+
$(DL_DIR)/$(EXPAT_SOURCE):
$(WGET) -P $(DL_DIR) $(EXPAT_SITE)/$(EXPAT_SOURCE)
@@ -17,13 +20,12 @@
$(EXPAT_DIR)/.unpacked: $(DL_DIR)/$(EXPAT_SOURCE)
$(EXPAT_CAT) $(DL_DIR)/$(EXPAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(EXPAT_DIR)/.unpacked
+ $(CONFIG_UPDATE) $(EXPAT_DIR)
+ touch $@
$(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked
(cd $(EXPAT_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -42,29 +44,29 @@
--infodir=/usr/info \
--enable-shared \
);
- touch $(EXPAT_DIR)/.configured
+ touch $@
-$(EXPAT_DIR)/.libs/libexpat.a: $(EXPAT_DIR)/.configured
+$(EXPAT_DIR)/$(EXPAT_BINARY): $(EXPAT_DIR)/.configured
$(MAKE) -C $(EXPAT_DIR) all
- touch -c $(EXPAT_DIR)/.libs/libexpat.a
+ touch -c $@
-$(STAGING_DIR)/lib/libexpat.so.1: $(EXPAT_DIR)/.libs/libexpat.a
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libexpat.la
- touch -c $(STAGING_DIR)/lib/libexpat.so.1
+$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY)
+ $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(EXPAT_DIR) install
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libexpat.la
+ touch -c $@
-$(TARGET_DIR)/lib/libexpat.so.1: $(STAGING_DIR)/lib/libexpat.so.1
- cp -dpf $(STAGING_DIR)/lib/libexpat.so* $(TARGET_DIR)/lib/
- #cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/bin/xmlwf
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libexpat.so*
- touch -c $(TARGET_DIR)/lib/libexpat.so.1
+$(TARGET_DIR)/$(EXPAT_TARGET_BINARY): $(STAGING_DIR)/$(EXPAT_TARGET_BINARY)
+ cp -dpf $(STAGING_DIR)/usr/lib/libexpat.so* $(TARGET_DIR)/usr/lib/
+ #cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libexpat.so*
+ touch -c $@
-expat: uclibc pkgconfig $(TARGET_DIR)/lib/libexpat.so.1
+expat: uclibc pkgconfig $(TARGET_DIR)/$(EXPAT_TARGET_BINARY)
expat-clean:
rm -f $(EXPAT_DIR)/.configured
- rm -f $(STAGING_DIR)/lib/libexpat.* $(TARGET_DIR)/lib/libexpat.*
- #rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/bin/xmlwf
+ rm -f $(STAGING_DIR)/usr/lib/libexpat.* $(TARGET_DIR)/usr/lib/libexpat.*
+ #rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf
-$(MAKE) -C $(EXPAT_DIR) clean
#############################################################
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-05-09 11:46 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2007-05-09 11:46 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-05-09 04:46:47 -0700 (Wed, 09 May 2007)
New Revision: 18589
Log:
Strip lib even if soname changes
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-05-08 23:23:35 UTC (rev 18588)
+++ trunk/buildroot/package/expat/expat.mk 2007-05-09 11:46:47 UTC (rev 18589)
@@ -56,7 +56,7 @@
$(TARGET_DIR)/lib/libexpat.so.1: $(STAGING_DIR)/lib/libexpat.so.1
cp -dpf $(STAGING_DIR)/lib/libexpat.so* $(TARGET_DIR)/lib/
#cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/bin/xmlwf
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libexpat.so.0.5.0
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libexpat.so*
touch -c $(TARGET_DIR)/lib/libexpat.so.1
expat: uclibc pkgconfig $(TARGET_DIR)/lib/libexpat.so.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2007-01-11 7:25 andersen at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-11 7:25 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-10 23:25:01 -0800 (Wed, 10 Jan 2007)
New Revision: 17240
Log:
fix dependancies and install paths
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2007-01-11 06:17:24 UTC (rev 17239)
+++ trunk/buildroot/package/expat/expat.mk 2007-01-11 07:25:01 UTC (rev 17240)
@@ -41,23 +41,27 @@
);
touch $(EXPAT_DIR)/.configured
-$(EXPAT_DIR)/.libs/libexpat.so.0.5.0: $(EXPAT_DIR)/.configured
+$(EXPAT_DIR)/.libs/libexpat.a: $(EXPAT_DIR)/.configured
$(MAKE) -C $(EXPAT_DIR) all
+ touch -c $(EXPAT_DIR)/.libs/libexpat.a
-$(STAGING_DIR)/lib/libexpat.so.0.5.0: $(EXPAT_DIR)/.libs/libexpat.so.0.5.0
- $(MAKE) -C $(EXPAT_DIR) prefix=$(STAGING_DIR) exec_prefix=$(STAGING_DIR) mandir=$(STAGING_DIR)/man install
+$(STAGING_DIR)/lib/libexpat.so.1: $(EXPAT_DIR)/.libs/libexpat.a
+ $(MAKE) -C $(EXPAT_DIR) prefix=$(STAGING_DIR) \
+ exec_prefix=$(STAGING_DIR) mandir=$(STAGING_DIR)/man install
+ touch -c $(STAGING_DIR)/lib/libexpat.so.1
-$(TARGET_DIR)/usr/lib/libexpat.so.0.5.0: $(STAGING_DIR)/lib/libexpat.so.0.5.0
- cp -dpf $(STAGING_DIR)/lib/libexpat.so* $(TARGET_DIR)/usr/lib/
- cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libexpat.so.0.5.0
+$(TARGET_DIR)/lib/libexpat.so.1: $(STAGING_DIR)/lib/libexpat.so.1
+ cp -dpf $(STAGING_DIR)/lib/libexpat.so* $(TARGET_DIR)/lib/
+ #cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/bin/xmlwf
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libexpat.so.0.5.0
+ touch -c $(TARGET_DIR)/lib/libexpat.so.1
-expat: uclibc $(TARGET_DIR)/usr/lib/libexpat.so.0.5.0
+expat: uclibc $(TARGET_DIR)/lib/libexpat.so.1
expat-clean:
rm -f $(EXPAT_DIR)/.configured
- rm -f $(STAGING_DIR)/lib/libexpat.* $(TARGET_DIR)/usr/lib/libexpat.*
- rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf
+ rm -f $(STAGING_DIR)/lib/libexpat.* $(TARGET_DIR)/lib/libexpat.*
+ #rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/bin/xmlwf
-$(MAKE) -C $(EXPAT_DIR) clean
#############################################################
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/expat
@ 2006-08-24 22:00 aldot at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: aldot at uclibc.org @ 2006-08-24 22:00 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-08-24 15:00:36 -0700 (Thu, 24 Aug 2006)
New Revision: 15988
Log:
- update to 2.0.0 and correct site.
Modified:
trunk/buildroot/package/expat/expat.mk
Changeset:
Modified: trunk/buildroot/package/expat/expat.mk
===================================================================
--- trunk/buildroot/package/expat/expat.mk 2006-08-24 21:46:57 UTC (rev 15987)
+++ trunk/buildroot/package/expat/expat.mk 2006-08-24 22:00:36 UTC (rev 15988)
@@ -4,10 +4,10 @@
#
#############################################################
-EXPAT_VERSION=1.95.8
+EXPAT_VERSION=2.0.0
EXPAT_SOURCE=expat-$(EXPAT_VERSION).tar.gz
-EXPAT_SITE=http://internap.dl.sourceforge.net/sourceforge/expat
+EXPAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
EXPAT_DIR:=$(BUILD_DIR)/expat-$(EXPAT_VERSION)
$(DL_DIR)/$(EXPAT_SOURCE):
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2008-06-13 13:31 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-15 21:27 [Buildroot] svn commit: trunk/buildroot/package/expat andersen at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-06-13 13:31 jacmet at uclibc.org
2008-04-24 14:04 ninevoltz at uclibc.org
2008-04-24 13:15 ninevoltz at uclibc.org
2008-04-24 13:18 ` Hans-Christian Egtvedt
2008-04-24 13:38 ` John Voltz
2008-04-24 13:49 ` Peter Korsgaard
2008-03-31 20:09 jacmet at uclibc.org
2007-08-12 14:13 ulf at uclibc.org
2007-08-11 23:03 ulf at uclibc.org
2007-08-11 18:25 ulf at uclibc.org
2007-07-08 13:55 aldot at uclibc.org
2007-06-25 8:37 aldot at uclibc.org
2007-05-09 11:46 jacmet at uclibc.org
2007-01-11 7:25 andersen at uclibc.org
2006-08-24 22:00 aldot 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