NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6a5c200608
kumquat-buildroot/package/pkgconf/pkgconf.mk

45 lines
1.2 KiB
Makefile
Raw Normal View History

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 01:53:30 +02:00
################################################################################
pkgconf: new package pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we rely instead on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-24 12:10:44 +02:00
#
# pkgconf
#
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 01:53:30 +02:00
################################################################################
pkgconf: new package pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we rely instead on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-24 12:10:44 +02:00
package/pkgconf: bump to 1.5.3, change upstream The pkgconf project now has a website at pkgconf.org, and hosts its tarballs at https://distfiles.dereferenced.org/pkgconf/, so this commit updates the upstream location, and uses the xz-compressed tarball as well. pkgconf is bumped to 1.5.3. What prompted this update is the fact that GStreamer uses the --define-prefix option when calling pkg-config, and this option didn't exist in pkgconf 0.9.2. The patch 0001-Fix-all-variables-sysroot-prefix-problem.patch is dropped, because pkgconf now behaves properly, by prefixing all paths with the sysroot. This has been verified by testing libdir and includedir in zlib.pc, and adding some dummy pkgdatadir, mapdir and sdkdir variables: $ cat staging/usr/lib/pkgconfig/zlib.pc prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib sharedlibdir=${libdir} includedir=${prefix}/include pkgdatadir=${prefix}/pouet mapdir=${prefix}/this/is/map/dir sdkdir=${prefix}/this/is/sdk/dir [...] $ ./host/bin/pkg-config --variable=libdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib $ ./host/bin/pkg-config --variable=includedir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include $ ./host/bin/pkg-config --variable=mapdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/map/dir $ ./host/bin/pkg-config --variable=sdkdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/sdk/dir $ ./host/bin/pkg-config --variable=pkgdatadir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/pouet So, the 0001-Fix-all-variables-sysroot-prefix-problem patch is no longer necessary. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-09-08 22:05:07 +02:00
PKGCONF_VERSION = 1.5.3
package/pkgconf: purge trailing '/' from PKGCONF_SITE <PKG>_SITE cannot have a trailing slash. This was not detected by the check in generic-package because it is a host-only package without Config.in symbol. Signed-off-by: Carlos Santos <casantos@datacom.com.br> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2018-12-10 19:34:47 +01:00
PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf
package/pkgconf: bump to 1.5.3, change upstream The pkgconf project now has a website at pkgconf.org, and hosts its tarballs at https://distfiles.dereferenced.org/pkgconf/, so this commit updates the upstream location, and uses the xz-compressed tarball as well. pkgconf is bumped to 1.5.3. What prompted this update is the fact that GStreamer uses the --define-prefix option when calling pkg-config, and this option didn't exist in pkgconf 0.9.2. The patch 0001-Fix-all-variables-sysroot-prefix-problem.patch is dropped, because pkgconf now behaves properly, by prefixing all paths with the sysroot. This has been verified by testing libdir and includedir in zlib.pc, and adding some dummy pkgdatadir, mapdir and sdkdir variables: $ cat staging/usr/lib/pkgconfig/zlib.pc prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib sharedlibdir=${libdir} includedir=${prefix}/include pkgdatadir=${prefix}/pouet mapdir=${prefix}/this/is/map/dir sdkdir=${prefix}/this/is/sdk/dir [...] $ ./host/bin/pkg-config --variable=libdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib $ ./host/bin/pkg-config --variable=includedir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include $ ./host/bin/pkg-config --variable=mapdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/map/dir $ ./host/bin/pkg-config --variable=sdkdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/sdk/dir $ ./host/bin/pkg-config --variable=pkgdatadir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/pouet So, the 0001-Fix-all-variables-sysroot-prefix-problem patch is no longer necessary. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-09-08 22:05:07 +02:00
PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz
pkgconf: add license informations Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-20 10:22:36 +01:00
PKGCONF_LICENSE = pkgconf license
PKGCONF_LICENSE_FILES = COPYING
pkgconf: new package pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we rely instead on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-24 12:10:44 +02:00
Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:19 +02:00
PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config
pkgconf: new package pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we rely instead on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-24 12:10:44 +02:00
define PKGCONF_LINK_PKGCONFIG
ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config
endef
define HOST_PKGCONF_INSTALL_WRAPPER
$(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:19 +02:00
$(HOST_DIR)/bin/pkg-config
pkgconf: use relative path to STAGING_DIR instead of absolute path The pkg-config wrapper script is currently generated with absolute paths to $(STAGING_DIR). However, this will not work properly with per-package SDK, and each package will be built with a different STAGING_DIR value. In order to fix this, we adjust how the pkg-config wrapper script is generated, so that it uses a relative path to itself: the sysroot (i.e STAGING_DIR) is always located in $(path of pkg-config)/../$(STAGING_SUBDIR). This change is independent from the per-package SDK work, and could be applied independently from it. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-01 21:53:38 +01:00
$(SED) 's,@STAGING_SUBDIR@,$(STAGING_SUBDIR),g' \
Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:19 +02:00
$(HOST_DIR)/bin/pkg-config
pkgconf: new package pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we rely instead on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-24 12:10:44 +02:00
endef
host-pkgconf: use --static option for static builds Detect when BR2_PREFER_STATIC_LIBS is selected and modify the host pkg-config wrapper to append the --static option in that case. Fixes: http://autobuild.buildroot.net/results/161/161446dde7e8e774773eb2b34fd555f5ac22dd02/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-05 13:19:37 +01:00
define HOST_PKGCONF_STATIC
Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:19 +02:00
$(SED) 's,@STATIC@,--static,' $(HOST_DIR)/bin/pkg-config
host-pkgconf: use --static option for static builds Detect when BR2_PREFER_STATIC_LIBS is selected and modify the host pkg-config wrapper to append the --static option in that case. Fixes: http://autobuild.buildroot.net/results/161/161446dde7e8e774773eb2b34fd555f5ac22dd02/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-05 13:19:37 +01:00
endef
define HOST_PKGCONF_SHARED
Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:19 +02:00
$(SED) 's,@STATIC@,,' $(HOST_DIR)/bin/pkg-config
host-pkgconf: use --static option for static builds Detect when BR2_PREFER_STATIC_LIBS is selected and modify the host pkg-config wrapper to append the --static option in that case. Fixes: http://autobuild.buildroot.net/results/161/161446dde7e8e774773eb2b34fd555f5ac22dd02/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-05 13:19:37 +01:00
endef
pkgconf: new package pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we rely instead on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-24 12:10:44 +02:00
PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
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-03 22:41:29 +01:00
ifeq ($(BR2_STATIC_LIBS),y)
packages: indentation cleanup This commit doesn't touch infra packages. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-31 09:21:57 +02:00
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC
host-pkgconf: use --static option for static builds Detect when BR2_PREFER_STATIC_LIBS is selected and modify the host pkg-config wrapper to append the --static option in that case. Fixes: http://autobuild.buildroot.net/results/161/161446dde7e8e774773eb2b34fd555f5ac22dd02/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-05 13:19:37 +01:00
else
packages: indentation cleanup This commit doesn't touch infra packages. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-31 09:21:57 +02:00
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_SHARED
host-pkgconf: use --static option for static builds Detect when BR2_PREFER_STATIC_LIBS is selected and modify the host pkg-config wrapper to append the --static option in that case. Fixes: http://autobuild.buildroot.net/results/161/161446dde7e8e774773eb2b34fd555f5ac22dd02/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-05 13:19:37 +01:00
endif
pkgconf: new package pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we rely instead on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-24 12:10:44 +02:00
$(eval $(autotools-package))
$(eval $(host-autotools-package))
Reference in New Issue Copy Permalink