* [Buildroot] svn commit: trunk/buildroot/package/bzip2
@ 2007-06-25 14:53 aldot at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 14:53 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 07:53:24 -0700 (Mon, 25 Jun 2007)
New Revision: 18929
Log:
- bump version and correct installation path
Modified:
trunk/buildroot/package/bzip2/bzip2.mk
Changeset:
Modified: trunk/buildroot/package/bzip2/bzip2.mk
===================================================================
--- trunk/buildroot/package/bzip2/bzip2.mk 2007-06-25 11:22:26 UTC (rev 18928)
+++ trunk/buildroot/package/bzip2/bzip2.mk 2007-06-25 14:53:24 UTC (rev 18929)
@@ -3,7 +3,7 @@
# bzip2
#
#############################################################
-BZIP2_VER:=1.0.3
+BZIP2_VER:=1.0.4
BZIP2_SOURCE:=bzip2-$(BZIP2_VER).tar.gz
BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VER)
BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VER)
@@ -27,23 +27,24 @@
endif
$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile
$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
- touch $(BZIP2_DIR)/.unpacked
+ touch $@
$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER): $(BZIP2_DIR)/.unpacked
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) -f Makefile-libbz2_so
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) libbz2.a
- cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/include/
+ cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(STAGING_DIR)/lib/
- cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/lib/
- (cd $(STAGING_DIR)/lib/; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so)
- (cd $(STAGING_DIR)/lib/; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0)
+ cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
+ (cd $(STAGING_DIR)/usr/lib/ ; ln -snf ../../lib/libbz2.so.$(BZIP2_VER) libbz2.so)
+ (cd $(STAGING_DIR)/lib ; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0; \
+ ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1)
$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover
- touch -c $(BZIP2_BINARY)
+ touch -c $@
$(BZIP2_TARGET_BINARY): $(BZIP2_BINARY)
(cd $(TARGET_DIR)/usr/bin; \
@@ -68,21 +69,25 @@
$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a
mkdir -p $(TARGET_DIR)/usr/include
- cp $(STAGING_DIR)/include/bzlib.h $(TARGET_DIR)/usr/include/
+ cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/
cp $(STAGING_DIR)/lib/libbz2.a $(TARGET_DIR)/usr/lib/
rm -f $(TARGET_DIR)/lib/libbz2.so
(cd $(TARGET_DIR)/usr/lib; \
ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \
)
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libbz2.so.1.0
- touch -c $(TARGET_DIR)/usr/lib/libbz2.a
+ touch -c $@
bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a
bzip2: uclibc $(BZIP2_TARGET_BINARY)
bzip2-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BZIP2_DIR) uninstall
+ -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BZIP2_DIR) uninstall
+ rm -f $(TARGET_DIR)/usr/lib/libbz2.* $(TARGET_DIR)/lib/libbz2.* \
+ $(TARGET_DIR)/usr/include/bzlib.h \
+ $(STAGING_DIR)/usr/include/bzlib.h \
+ $(STAGING_DIR)/usr/lib/libbz2.* $(STAGING_DIR)/lib/libbz2.*
-$(MAKE) -C $(BZIP2_DIR) clean
bzip2-dirclean:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bzip2
@ 2008-03-06 17:56 ninevoltz at uclibc.org
2008-03-06 23:47 ` Hamish Moffatt
0 siblings, 1 reply; 7+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 17:56 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 09:56:10 -0800 (Thu, 06 Mar 2008)
New Revision: 21184
Log:
makefile cleanup for bzip2
Modified:
trunk/buildroot/package/bzip2/bzip2.mk
Changeset:
Modified: trunk/buildroot/package/bzip2/bzip2.mk
===================================================================
--- trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:55:51 UTC (rev 21183)
+++ trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:56:10 UTC (rev 21184)
@@ -29,7 +29,7 @@
$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
touch $@
-$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
+$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-C $(BZIP2_DIR) -f Makefile-libbz2_so
@@ -37,17 +37,17 @@
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-C $(BZIP2_DIR) libbz2.a
cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
- cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/lib/
+ cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
(cd $(STAGING_DIR)/usr/lib/; \
ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so; \
)
- (cd $(STAGING_DIR)/lib; \
+ (cd $(STAGING_DIR)/usr/lib; \
ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
)
-$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION)
+$(BZIP2_BINARY): $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover
touch -c $@
@@ -83,10 +83,10 @@
rm -rf $(TARGET_DIR)/share/locale
rm -rf $(TARGET_DIR)/usr/share/doc
-$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a
+$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a
mkdir -p $(TARGET_DIR)/usr/include
cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/
- cp $(STAGING_DIR)/lib/libbz2.a $(TARGET_DIR)/usr/lib/
+ cp $(STAGING_DIR)/usr/lib/libbz2.a $(TARGET_DIR)/usr/lib/
rm -f $(TARGET_DIR)/lib/libbz2.so
(cd $(TARGET_DIR)/usr/lib; \
ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bzip2
2008-03-06 17:56 [Buildroot] svn commit: trunk/buildroot/package/bzip2 ninevoltz at uclibc.org
@ 2008-03-06 23:47 ` Hamish Moffatt
2008-03-06 23:56 ` Ulf Samuelsson
0 siblings, 1 reply; 7+ messages in thread
From: Hamish Moffatt @ 2008-03-06 23:47 UTC (permalink / raw)
To: buildroot
On Thu, Mar 06, 2008 at 09:56:11AM -0800, ninevoltz at uclibc.org wrote:
> Author: ninevoltz
> Date: 2008-03-06 09:56:10 -0800 (Thu, 06 Mar 2008)
> New Revision: 21184
>
> Log:
> makefile cleanup for bzip2
>
> Modified:
> trunk/buildroot/package/bzip2/bzip2.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/bzip2/bzip2.mk
> ===================================================================
> --- trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:55:51 UTC (rev 21183)
> +++ trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:56:10 UTC (rev 21184)
> @@ -29,7 +29,7 @@
> $(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
> touch $@
>
> -$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
> +$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
Why move libbz2 from /lib to /usr/lib?
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bzip2
2008-03-06 23:47 ` Hamish Moffatt
@ 2008-03-06 23:56 ` Ulf Samuelsson
2008-03-07 0:01 ` Hamish Moffatt
0 siblings, 1 reply; 7+ messages in thread
From: Ulf Samuelsson @ 2008-03-06 23:56 UTC (permalink / raw)
To: buildroot
----- Original Message -----
From: "Hamish Moffatt" <hamish@cloud.net.au>
To: <buildroot@uclibc.org>
Sent: Friday, March 07, 2008 12:47 AM
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/bzip2
> On Thu, Mar 06, 2008 at 09:56:11AM -0800, ninevoltz at uclibc.org wrote:
>> Author: ninevoltz
>> Date: 2008-03-06 09:56:10 -0800 (Thu, 06 Mar 2008)
>> New Revision: 21184
>>
>> Log:
>> makefile cleanup for bzip2
>>
>> Modified:
>> trunk/buildroot/package/bzip2/bzip2.mk
>>
>>
>> Changeset:
>> Modified: trunk/buildroot/package/bzip2/bzip2.mk
>> ===================================================================
>> --- trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:55:51 UTC (rev 21183)
>> +++ trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:56:10 UTC (rev 21184)
>> @@ -29,7 +29,7 @@
>> $(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
>> touch $@
>>
>> -$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
>> +$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
>
> Why move libbz2 from /lib to /usr/lib?
>
>
I think that this has been the trend for the last year.
A lot of packages has had this change.
Best Regards
Ulf Samuelsson
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bzip2
2008-03-06 23:56 ` Ulf Samuelsson
@ 2008-03-07 0:01 ` Hamish Moffatt
2008-03-07 8:24 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 7+ messages in thread
From: Hamish Moffatt @ 2008-03-07 0:01 UTC (permalink / raw)
To: buildroot
On Fri, Mar 07, 2008 at 12:56:09AM +0100, Ulf Samuelsson wrote:
> ----- Original Message -----
> From: "Hamish Moffatt" <hamish@cloud.net.au>
> To: <buildroot@uclibc.org>
> Sent: Friday, March 07, 2008 12:47 AM
> Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/bzip2
>
> > Why move libbz2 from /lib to /usr/lib?
>
>
> I think that this has been the trend for the last year.
> A lot of packages has had this change.
I think some sort of policy document would be useful here. If libbz2 is
in /usr/lib, that means no binaries in /bin or /sbin should use it
really.
Is /usr really irrelevant on a buildroot-sized system anyway? Should we
just put everything in /lib, /bin and /sbin and forget it? (Perhaps even
bin and sbin should merge.)
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bzip2
2008-03-07 0:01 ` Hamish Moffatt
@ 2008-03-07 8:24 ` Hans-Christian Egtvedt
0 siblings, 0 replies; 7+ messages in thread
From: Hans-Christian Egtvedt @ 2008-03-07 8:24 UTC (permalink / raw)
To: buildroot
On Fri, 2008-03-07 at 11:01 +1100, Hamish Moffatt wrote:
> On Fri, Mar 07, 2008 at 12:56:09AM +0100, Ulf Samuelsson wrote:
> > ----- Original Message -----
> > From: "Hamish Moffatt" <hamish@cloud.net.au>
> > To: <buildroot@uclibc.org>
> > Sent: Friday, March 07, 2008 12:47 AM
> > Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/bzip2
> >
> > > Why move libbz2 from /lib to /usr/lib?
> >
> >
> > I think that this has been the trend for the last year.
> > A lot of packages has had this change.
>
> I think some sort of policy document would be useful here. If libbz2 is
> in /usr/lib, that means no binaries in /bin or /sbin should use it
> really.
>
Agreed.
Applications in /bin and /sbin which are dynamic linked must find their
libraries in /lib.
> Is /usr really irrelevant on a buildroot-sized system anyway? Should we
> just put everything in /lib, /bin and /sbin and forget it? (Perhaps even
> bin and sbin should merge.)
>
No, some embedded systems have multiple flash partitions, and might use
one for /usr stuff and another for / stuff.
And please do not merge /bin and /sbin;
1. you must change a whole lot of Makefiles (make install)
2. some systems actually have multiple users ;)
--
With kind regards,
Hans-Christian Egtvedt, Applications Engineer
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bzip2
@ 2009-01-20 22:25 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2009-01-20 22:25 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-20 22:25:55 +0000 (Tue, 20 Jan 2009)
New Revision: 24929
Log:
Make libbz2.so point at libbz2.so.1.0.4 in /usr/lib (correct) instead of in /lib
Modified:
trunk/buildroot/package/bzip2/bzip2.mk
Changeset:
Modified: trunk/buildroot/package/bzip2/bzip2.mk
===================================================================
--- trunk/buildroot/package/bzip2/bzip2.mk 2009-01-20 21:34:46 UTC (rev 24928)
+++ trunk/buildroot/package/bzip2/bzip2.mk 2009-01-20 22:25:55 UTC (rev 24929)
@@ -40,7 +40,7 @@
cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
(cd $(STAGING_DIR)/usr/lib/; \
- ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so; \
+ ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
)
(cd $(STAGING_DIR)/usr/lib; \
ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-01-20 22:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-06 17:56 [Buildroot] svn commit: trunk/buildroot/package/bzip2 ninevoltz at uclibc.org
2008-03-06 23:47 ` Hamish Moffatt
2008-03-06 23:56 ` Ulf Samuelsson
2008-03-07 0:01 ` Hamish Moffatt
2008-03-07 8:24 ` Hans-Christian Egtvedt
-- strict thread matches above, loose matches on Subject: below --
2009-01-20 22:25 ulf at uclibc.org
2007-06-25 14:53 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