Commit Graph

59 Commits

Author SHA1 Message Date
Yann E. MORIN
bef6d517fb package/zlib: allow shared-only builds
Currently, we can build a static-only zlib, but not a shared-only one.

This is because zlib's build-system is a custom ./configure (not using
autotools), and does not allow building/installing only the shared
library.

Simply remove the .a as a post-staging install hook. We don't care
removing it from target, since it is not used at link time to build
other packages, and it is anyway removed later before assembling the
filesystem images anyway.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-20 21:55:23 +01:00
Thomas Petazzoni
665e13c85e Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed
from "prefer static libraries when possible" to "use only static
libraries". The former semantic didn't make much sense, since the user
had absolutely no control/idea of which package would use static
libraries, and which packages would not. Therefore, for quite some
time, we have been starting to enforce that BR2_PREFER_STATIC_LIB
should really build everything with static libraries.

As a consequence, this patch renames BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS, and adjust the Config.in option accordingly.

This also helps preparing the addition of other options to select
shared, shared+static or just static.

Note that we have verified that this commit can be reproduced by
simply doing a global rename of BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-12-11 22:48:13 +01:00
Thomas De Schampheleire
3d86d29bf0 packages: remove package clean commands
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-08 19:42:34 +01:00
Thomas De Schampheleire
eb7bd9ef61 packages: remove uninstall commands
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-06 09:40:40 +01:00
Jerzy Grzegorek
4b23af7021 zlib: bump to version 1.2.8
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-20 21:12:41 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Thomas Petazzoni
0e4d25ff0f packages: remove all := signs
Finally get rid of all := used for variable definitions in packages,
as we suggest in our manual and during the review of new packages.

While I was at it, I also sometimes added a few missing new lines
between the header and the first variable definition.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-20 20:49:02 +01:00
Stefan Froberg
721f339053 freetype, libfuse, libpng, x11vnc, zlib: get rid of BR2_SOURCEFORGE_MIRROR
Signed-off-by: Stefan Froberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-24 23:31:33 +02:00
Simon Dawson
dd71973d84 zlib: add license information
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-21 12:41:07 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Arnout Vandecappelle (Essensium/Mind)
69e64c42b7 all packages: use new host-xxx-package macros
This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS,host))/$(eval $(host-generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS,host))/$(eval $(host-autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS,host))/$(eval $(host-cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:18:03 +02:00
Gustavo Zacarias
cb867f991f zlib: bump to version 1.2.7
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-10 21:54:16 +02:00
Peter Korsgaard
7b462167ee zlib: bump version
Patch is now upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-13 11:25:18 +01:00
Thomas Petazzoni
0849e8193e package: remove useless arguments from GENTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:09:58 +02:00
Peter Korsgaard
7dae68a0fa zlib: always build host version dynamically
Host libraries should always be built using dynamic linking, rather than
static if BR2_PREFER_STATIC_LIB is enabled, as that then breaks dependent
libraries expecting a shared library.

Reported-by: Andy Kennedy <andy.kennedy@adtran.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-20 23:51:17 +02:00
Thomas Petazzoni
7197089540 zlib: disable call to ldconfig
By default, zlib installation procedure calls ldconfig, which takes
time uselessly. ldconfig is only useful if you install libraries on
the host (in directories listed in /etc/ld.so.conf, or in /usr/lib or
/lib), so calling it after installing libraries in $(STAGING_DIR),
$(TARGET_DIR) or $(HOST_DIR) is just a lenghty no-op.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-26 16:46:49 +01:00
Peter Korsgaard
bab71ad4dd zlib: don't point libdir/includedir at staging
Fixes 'make install'.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-24 21:28:40 +01:00
Peter Korsgaard
ab2f5567c1 zlib: cleanup, fix install for static only build
Use 'make install' for installation, add a patch to make it work for
static only builds, and add uninstall/clean targets while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-24 16:23:12 +01:00
Lionel Landwerlin
3df6b56f53 zlib: Fix build
Using "make -j $(N)" with N > 1 sometimes breaks zlib build.

Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-09-20 09:21:24 +02:00
Paul Jones
d47c73ee9b zlib: Bump to 1.2.5
Closes #1981

Signed-off-by: Paul Jones <paul@pauljones.id.au>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-27 23:52:58 +02:00
Thomas Petazzoni
a55cd51b85 zlib: enable compilation on the host
zlib is needed on the host, to build xlib_libfontenc on the host, to
build xapp_mkfontscale on the host, in order to finally build xfonts
encodings on the target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-02-23 20:08:11 +01:00
Lionel Landwerlin
5ad8ad0c37 zlib: fix headers installation in target directory
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-28 21:48:40 +01:00
Thomas Petazzoni
9e1d5ccd4d zlib: rework on top of the generic infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-12-15 19:57:30 +01:00
Peter Korsgaard
8ac5d34e78 zlib: fix typo
Fix typo introduced by 1e32e0700a (remove dedicated target-headers option).
Noticed by Alexander Clouter <alex@digriz.org.uk>.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-04 16:05:10 +02:00
Peter Korsgaard
1e32e0700a zlib: remove dedicated target-headers option
Instead, simply only copy headers/static lib if BR2_HAVE_DEVFILES
is enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-03 23:03:05 +02:00
Michael Roth
72a119c84b zlib: Replace negative logic in Makefile with positive
Positive logic is easier to read and understand than something
like 'if not option=yes then foo else bar'.

Signed-off-by: Michael Roth <mroth@nessie.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-09-30 11:52:56 +02:00
Will Newton
422ce6536b package: Remove unnecessary dependencies on uclibc.
A C library will have been built by the toolchain makefiles, so there is no
need for packages to explicitly depend on uclibc.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-09-03 20:22:38 +02:00
Peter Korsgaard
4a7bfd2775 package/: convert to DOWNLOAD helper 2009-01-16 11:42:52 +00:00
Hans-Christian Egtvedt
be866bfcbc 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>
2008-12-11 14:40:56 +00:00
Peter Korsgaard
8e436ee772 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>
2008-12-08 14:41:47 +00:00
Peter Korsgaard
ac1d92c425 package/: get rid of unneeded $(strip ..) 2008-12-08 08:15:27 +00:00
Thiago A. Corrêa
1830e8942f Fix zlib install broken by previous commit. Sorry 2008-10-31 16:37:01 +00:00
Thiago A. Corrêa
1bf91aa2a8 Make sure directories are created during install to STAGING_DIR and TARGET_DIR. Thanks to Thomas Petazzoni and Bernhard Reutner-Fischer. 2008-10-31 12:10:10 +00:00
Peter Korsgaard
60b5eee76e package: global largefile CFLAGS handling 2008-08-04 19:07:18 +00:00
Peter Korsgaard
a18bc39849 zlib: cleanup and fix -clean target 2008-07-17 13:19:54 +00:00
Bernhard Reutner-Fischer
14a71561a3 - just use the strip binary to avoid confusing libtool (quotes)
- use $(STRIPCMD) in packages to avoid clashes with $(STRIP)
2007-10-01 16:15:31 +00:00
Bernhard Reutner-Fischer
956d3eb78b - semicolon touchup. No other changes 2007-08-22 09:56:41 +00:00
Ulf Samuelsson
e4ead9c13c Remove switches if sstrip is run 2007-08-21 01:53:57 +00:00
Ulf Samuelsson
fc3fd8afd2 Use TARGET_CONFIGURE_ARGS in some packages lacking 2007-07-30 18:17:13 +00:00
Ulf Samuelsson
e1621a4a2a Use <package>_VERSION in all <package>.mk instead of <package>_VER 2007-07-11 14:06:06 +00:00
"Steven J. Hill"
9a4ca08e5f Remove usage of TARGET_LDFLAGS all together. Both TARGET_CFLAGS and TARGET_LDFLAGS are passed with the compilers and linker respectively so that we can pass CFLAGS and LDFLAGS on a per-package basis which was not possible previously and a number of packages failed to build. TARGET_CFLAGS usage in package makefiles will be removed next. 2007-07-06 04:26:32 +00:00
Bernhard Reutner-Fischer
2dd6b35498 - change download site to sourceforge 2007-06-29 08:18:13 +00:00
Bernhard Reutner-Fischer
933d5c60ef - improve the zlib-clean target 2007-06-25 09:07:08 +00:00
Bernhard Reutner-Fischer
2f92075db2 - make sure that TARGET_DIR/usr/lib exists 2007-06-25 09:01:53 +00:00
Bernhard Reutner-Fischer
41decaa9fe - install some more stuff that goes into staging_dir into the proper place.
First hunk of fixes for bug #1290
2007-04-16 18:51:20 +00:00
Eric Andersen
15177a6e95 yet more LDFLAGS handling fixups 2007-03-14 03:12:22 +00:00
Eric Andersen
85d7f6f05f fixup package LDFLAGS handling 2007-03-13 22:59:59 +00:00
Bernhard Reutner-Fischer
6e2823c1fa - add and use BR2_BZCAT config option. 2006-11-17 15:43:51 +00:00
Eric Andersen
7be3856489 fetch zlib from the cannonical site at zlib.net 2006-04-10 18:09:17 +00:00
Mike Frysinger
b915f4a31a use := instead of = for variables and make sure zlib builds with target cflags 2005-10-29 07:16:38 +00:00