* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2007-06-25 9:01 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 9:01 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 02:01:53 -0700 (Mon, 25 Jun 2007)
New Revision: 18912
Log:
- make sure that TARGET_DIR/usr/lib exists
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2007-06-25 08:58:38 UTC (rev 18911)
+++ trunk/buildroot/package/zlib/zlib.mk 2007-06-25 09:01:53 UTC (rev 18912)
@@ -55,11 +55,11 @@
touch -c $@
$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VER)
- mkdir -p $(TARGET_DIR)/usr/include
+ mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/
- rm -f $(TARGET_DIR)/lib/libz.so
+ rm -f $(TARGET_DIR)/lib/libz.so $(TARGET_DIR)/usr/lib/libz.so
ln -sf libz.so.$(ZLIB_VER) $(TARGET_DIR)/usr/lib/libz.so
touch -c $@
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2007-06-25 9:07 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 9:07 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 02:07:08 -0700 (Mon, 25 Jun 2007)
New Revision: 18913
Log:
- improve the zlib-clean target
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2007-06-25 09:01:53 UTC (rev 18912)
+++ trunk/buildroot/package/zlib/zlib.mk 2007-06-25 09:07:08 UTC (rev 18913)
@@ -50,6 +50,7 @@
touch -c $@
$(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VER): $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VER)
+ mkdir -p $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libz.so*
touch -c $@
@@ -71,7 +72,11 @@
zlib-clean:
rm -f $(TARGET_DIR)/usr/lib/libz.so* \
- $(TARGET_DIR)/usr/include/z{lib,conf}.h
+ $(TARGET_DIR)/usr/include/zlib.h \
+ $(TARGET_DIR)/usr/include/zconf.h \
+ $(STAGING_DIR)/usr/include/zlib.h \
+ $(STAGING_DIR)/usr/include/zconf.h \
+ $(STAGING_DIR)/usr/lib/libz.*
-$(MAKE) -C $(ZLIB_DIR) clean
zlib-dirclean:
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2007-06-29 8:18 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-06-29 8:18 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-29 01:18:13 -0700 (Fri, 29 Jun 2007)
New Revision: 18969
Log:
- change download site to sourceforge
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2007-06-28 22:38:48 UTC (rev 18968)
+++ trunk/buildroot/package/zlib/zlib.mk 2007-06-29 08:18:13 UTC (rev 18969)
@@ -6,7 +6,7 @@
ZLIB_VER:=1.2.3
ZLIB_SOURCE:=zlib-$(ZLIB_VER).tar.bz2
ZLIB_CAT:=$(BZCAT)
-ZLIB_SITE:=http://www.zlib.net/
+ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VER)
ZLIB_CFLAGS:=$(TARGET_CFLAGS) -fPIC
ifeq ($(BR2_LARGEFILE),y)
@@ -33,7 +33,7 @@
--exec-prefix=$(STAGING_DIR)/usr/bin \
--libdir=$(STAGING_DIR)/usr/lib \
--includedir=$(STAGING_DIR)/usr/include \
- );
+ )
touch $@
$(ZLIB_DIR)/libz.so.$(ZLIB_VER): $(ZLIB_DIR)/.configured
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2008-07-17 13:19 jacmet at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: jacmet at uclibc.org @ 2008-07-17 13:19 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-17 06:19:54 -0700 (Thu, 17 Jul 2008)
New Revision: 22860
Log:
zlib: cleanup and fix -clean target
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2008-07-17 13:19:42 UTC (rev 22859)
+++ trunk/buildroot/package/zlib/zlib.mk 2008-07-17 13:19:54 UTC (rev 22860)
@@ -36,47 +36,43 @@
)
touch $@
-$(ZLIB_DIR)/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/.configured
+$(ZLIB_DIR)/libz.so: $(ZLIB_DIR)/.configured
$(MAKE) -C $(ZLIB_DIR) all libz.a
- touch -c $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION)
+ touch -c $@
-$(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION)
+$(STAGING_DIR)/usr/lib/libz.so: $(ZLIB_DIR)/libz.so
cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
- ln -sf libz.so.$(ZLIB_VERSION) $(STAGING_DIR)/usr/lib/libz.so.1
- chmod a-x $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
touch -c $@
-$(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
+$(TARGET_DIR)/usr/lib/libz.so: $(STAGING_DIR)/usr/lib/libz.so
mkdir -p $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libz.so*
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
touch -c $@
-$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
+$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so
mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/
- rm -f $(TARGET_DIR)/lib/libz.so $(TARGET_DIR)/usr/lib/libz.so
- ln -sf libz.so.$(ZLIB_VERSION) $(TARGET_DIR)/usr/lib/libz.so
touch -c $@
zlib-headers: $(TARGET_DIR)/usr/lib/libz.a
-zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
+zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so
zlib-source: $(DL_DIR)/$(ZLIB_SOURCE)
zlib-clean:
- rm -f $(TARGET_DIR)/usr/lib/libz.so* \
- $(TARGET_DIR)/usr/include/zlib.h \
- $(TARGET_DIR)/usr/include/zconf.h \
- $(STAGING_DIR)/usr/include/zlib.h \
- $(STAGING_DIR)/usr/include/zconf.h \
- $(STAGING_DIR)/usr/lib/libz.*
+ rm -f $(TARGET_DIR)/usr/lib/libz.* \
+ $(TARGET_DIR)/usr/include/zlib.h \
+ $(TARGET_DIR)/usr/include/zconf.h \
+ $(STAGING_DIR)/usr/include/zlib.h \
+ $(STAGING_DIR)/usr/include/zconf.h \
+ $(STAGING_DIR)/usr/lib/libz.*
-$(MAKE) -C $(ZLIB_DIR) clean
zlib-dirclean:
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2008-10-31 12:10 correa at uclibc.org
2008-10-31 15:31 ` Thomas Petazzoni
0 siblings, 1 reply; 10+ messages in thread
From: correa at uclibc.org @ 2008-10-31 12:10 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-10-31 05:10:10 -0700 (Fri, 31 Oct 2008)
New Revision: 23879
Log:
Make sure directories are created during install to STAGING_DIR and TARGET_DIR. Thanks to Thomas Petazzoni and Bernhard Reutner-Fischer.
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2008-10-31 09:50:42 UTC (rev 23878)
+++ trunk/buildroot/package/zlib/zlib.mk 2008-10-31 12:10:10 UTC (rev 23879)
@@ -37,23 +37,21 @@
touch -c $@
$(STAGING_DIR)/usr/lib/libz.so: $(ZLIB_DIR)/libz.so
- cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
- cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
- cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
- cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
+ $(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
+ $(INSTALL) -D $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
+ $(INSTALL) $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
+ $(INSTALL) $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
touch -c $@
$(TARGET_DIR)/usr/lib/libz.so: $(STAGING_DIR)/usr/lib/libz.so
- mkdir -p $(TARGET_DIR)/usr/lib
- cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib
+ $(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
touch -c $@
$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so
- mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib
- cp -dpf $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/
- cp -dpf $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/
- cp -dpf $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/
+ $(INSTALL) -D $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/
+ $(INSTALL) $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/
+ $(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/
touch -c $@
zlib-headers: $(TARGET_DIR)/usr/lib/libz.a
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
2008-10-31 12:10 correa at uclibc.org
@ 2008-10-31 15:31 ` Thomas Petazzoni
2008-10-31 16:37 ` Thiago A. Corrêa
0 siblings, 1 reply; 10+ messages in thread
From: Thomas Petazzoni @ 2008-10-31 15:31 UTC (permalink / raw)
To: buildroot
Le Fri, 31 Oct 2008 05:10:11 -0700 (PDT),
correa at uclibc.org a ?crit :
> $(STAGING_DIR)/usr/lib/libz.so: $(ZLIB_DIR)/libz.so
> - cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
> - cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
> - cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
> - cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
> + $(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
This doesn't work: even with the -D option, it doesn't create the
intermediate directories. It should be:
$(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/libz.a
> + $(INSTALL) -D $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
Same thing here.
Cheers,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
2008-10-31 15:31 ` Thomas Petazzoni
@ 2008-10-31 16:37 ` Thiago A. Corrêa
0 siblings, 0 replies; 10+ messages in thread
From: Thiago A. Corrêa @ 2008-10-31 16:37 UTC (permalink / raw)
To: buildroot
Ops, my bad.
Should be ok in 23885.
On Fri, Oct 31, 2008 at 1:31 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Le Fri, 31 Oct 2008 05:10:11 -0700 (PDT),
> correa at uclibc.org a ?crit :
>
>> $(STAGING_DIR)/usr/lib/libz.so: $(ZLIB_DIR)/libz.so
>> - cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
>> - cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
>> - cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
>> - cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
>> + $(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
>
> This doesn't work: even with the -D option, it doesn't create the
> intermediate directories. It should be:
>
> $(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/libz.a
>
>> + $(INSTALL) -D $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
>
> Same thing here.
>
> Cheers,
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers and embedded Linux development,
> consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2008-10-31 16:37 correa at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: correa at uclibc.org @ 2008-10-31 16:37 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-10-31 09:37:01 -0700 (Fri, 31 Oct 2008)
New Revision: 23885
Log:
Fix zlib install broken by previous commit. Sorry
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2008-10-31 14:18:04 UTC (rev 23884)
+++ trunk/buildroot/package/zlib/zlib.mk 2008-10-31 16:37:01 UTC (rev 23885)
@@ -37,21 +37,22 @@
touch -c $@
$(STAGING_DIR)/usr/lib/libz.so: $(ZLIB_DIR)/libz.so
- $(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
- $(INSTALL) -D $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
+ $(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/libz.a
+ $(INSTALL) -D $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/zlib.h
$(INSTALL) $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
$(INSTALL) $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
touch -c $@
$(TARGET_DIR)/usr/lib/libz.so: $(STAGING_DIR)/usr/lib/libz.so
- $(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib
+ mkdir -p $(TARGET_DIR)/usr/lib
+ cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
touch -c $@
$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so
- $(INSTALL) -D $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/
+ $(INSTALL) -D $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/zlib.h
$(INSTALL) $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/
- $(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/
+ $(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/libz.a
touch -c $@
zlib-headers: $(TARGET_DIR)/usr/lib/libz.a
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2008-12-08 14:41 jacmet at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: jacmet at uclibc.org @ 2008-12-08 14:41 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-08 06:41:47 -0800 (Mon, 08 Dec 2008)
New Revision: 24324
Log:
have zlib respect BR2_PREFER_STATIC_LIB
The ARM uClinux BFLT format apparently doesn't support shared libs nor
-fPIC. So let's distinguish between shared and non shared builds by
having split rules for libz.a and libz.so based on BR2_PREFER_STATIC_LIB.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2008-12-08 13:48:37 UTC (rev 24323)
+++ trunk/buildroot/package/zlib/zlib.mk 2008-12-08 14:41:47 UTC (rev 24324)
@@ -18,13 +18,23 @@
$(CONFIG_UPDATE) $(@D)
touch $@
+ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ZLIB_PIC := -fPIC
+ZLIB_SHARED := --shared
+ZLIB_TARGET := $(TARGET_DIR)/usr/lib/libz.so
+else
+ZLIB_PIC :=
+ZLIB_SHARED :=
+ZLIB_TARGET := $(STAGING_DIR)/usr/lib/libz.a
+endif
+
$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
(cd $(ZLIB_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) -fPIC" \
+ CFLAGS="$(TARGET_CFLAGS) $(ZLIB_PIC)" \
./configure \
- --shared \
+ $(ZLIB_SHARED) \
--prefix=/usr \
--exec-prefix=$(STAGING_DIR)/usr/bin \
--libdir=$(STAGING_DIR)/usr/lib \
@@ -32,14 +42,17 @@
)
touch $@
-$(ZLIB_DIR)/libz.so: $(ZLIB_DIR)/.configured
+$(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured
$(MAKE) -C $(ZLIB_DIR) all libz.a
touch -c $@
-$(STAGING_DIR)/usr/lib/libz.so: $(ZLIB_DIR)/libz.so
+$(STAGING_DIR)/usr/lib/libz.a: $(ZLIB_DIR)/libz.a
$(INSTALL) -D $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/libz.a
$(INSTALL) -D $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/zlib.h
$(INSTALL) $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
+ touch -c $@
+
+$(STAGING_DIR)/usr/lib/libz.so: $(STAGING_DIR)/usr/lib/libz.a
$(INSTALL) $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
touch -c $@
@@ -49,7 +62,7 @@
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
touch -c $@
-$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so
+$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.a
$(INSTALL) -D $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/zlib.h
$(INSTALL) $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/
$(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/libz.a
@@ -57,7 +70,7 @@
zlib-headers: $(TARGET_DIR)/usr/lib/libz.a
-zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so
+zlib: uclibc $(ZLIB_TARGET)
zlib-source: $(DL_DIR)/$(ZLIB_SOURCE)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/zlib
@ 2008-12-11 14:40 egtvedt at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-11 14:40 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-11 06:40:56 -0800 (Thu, 11 Dec 2008)
New Revision: 24378
Log:
zlib: install using cp instead of install for zlib libraries
This patch will install zlib keeping the symlinks. The usage of
$(INSTALL) here did not take into account symbolic links.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/zlib/zlib.mk
Changeset:
Modified: trunk/buildroot/package/zlib/zlib.mk
===================================================================
--- trunk/buildroot/package/zlib/zlib.mk 2008-12-11 13:43:07 UTC (rev 24377)
+++ trunk/buildroot/package/zlib/zlib.mk 2008-12-11 14:40:56 UTC (rev 24378)
@@ -53,7 +53,7 @@
touch -c $@
$(STAGING_DIR)/usr/lib/libz.so: $(STAGING_DIR)/usr/lib/libz.a
- $(INSTALL) $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
+ cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
touch -c $@
$(TARGET_DIR)/usr/lib/libz.so: $(STAGING_DIR)/usr/lib/libz.so
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2008-12-11 14:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-25 9:01 [Buildroot] svn commit: trunk/buildroot/package/zlib aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-06-25 9:07 aldot at uclibc.org
2007-06-29 8:18 aldot at uclibc.org
2008-07-17 13:19 jacmet at uclibc.org
2008-10-31 12:10 correa at uclibc.org
2008-10-31 15:31 ` Thomas Petazzoni
2008-10-31 16:37 ` Thiago A. Corrêa
2008-10-31 16:37 correa at uclibc.org
2008-12-08 14:41 jacmet at uclibc.org
2008-12-11 14:40 egtvedt 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