mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 06:36:34 +00:00
pkg-config: remove deprecated
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
e070034d2e
commit
1f95d1a975
@ -112,7 +112,6 @@ source "package/make/Config.in"
|
|||||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||||
source "package/patch/Config.in"
|
source "package/patch/Config.in"
|
||||||
endif
|
endif
|
||||||
source "package/pkg-config/Config.in"
|
|
||||||
source "package/pkgconf/Config.in"
|
source "package/pkgconf/Config.in"
|
||||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||||
source "package/sed/Config.in"
|
source "package/sed/Config.in"
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
config BR2_PACKAGE_PKG_CONFIG
|
|
||||||
bool "pkg-config"
|
|
||||||
depends on BR2_USE_WCHAR # glib2
|
|
||||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
|
||||||
depends on BR2_USE_MMU # glib2
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
select BR2_PACKAGE_LIBGLIB2
|
|
||||||
help
|
|
||||||
pkg-config is a system for managing library compile/link
|
|
||||||
flags that works with automake and autoconf. It replaces
|
|
||||||
the ubiquitous *-config scripts you may have seen with a
|
|
||||||
single tool.
|
|
||||||
|
|
||||||
http://www.freedesktop.org/software/pkgconfig/
|
|
||||||
|
|
||||||
comment "pkg-config needs a toolchain w/ wchar, threads"
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
depends on BR2_USE_MMU
|
|
||||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
|
@ -1,30 +0,0 @@
|
|||||||
[PATCH] prefix sysroot to include/libdir path variables
|
|
||||||
|
|
||||||
Prefix includedir / libdir variable values with sysroot if a variable is
|
|
||||||
requested (--variable=<name>), similar to how it's done for -I / -L flags.
|
|
||||||
|
|
||||||
This is sometimes used to find header files (E.G. in gst-plugins configure),
|
|
||||||
so ensure the sysroot'ed files are used.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
|
||||||
---
|
|
||||||
main.c | 6 +++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
Index: pkg-config-0.25/main.c
|
|
||||||
===================================================================
|
|
||||||
--- pkg-config-0.25.orig/main.c
|
|
||||||
+++ pkg-config-0.25/main.c
|
|
||||||
@@ -700,6 +700,12 @@
|
|
||||||
if (variable_name)
|
|
||||||
{
|
|
||||||
char *str = packages_get_var (packages, variable_name);
|
|
||||||
+ /* include/lib variable? */
|
|
||||||
+ if (pcsysrootdir &&
|
|
||||||
+ (!strcmp(variable_name, "includedir") ||
|
|
||||||
+ !strcmp(variable_name, "mapdir") ||
|
|
||||||
+ !strcmp(variable_name, "libdir")))
|
|
||||||
+ printf ("%s/", pcsysrootdir);
|
|
||||||
printf ("%s", str);
|
|
||||||
g_free (str);
|
|
||||||
need_newline = TRUE;
|
|
@ -1,12 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
#
|
|
||||||
# pkg-config
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
PKG_CONFIG_VERSION = 0.25
|
|
||||||
PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
|
|
||||||
PKG_CONFIG_DEPENDENCIES = libglib2
|
|
||||||
PKG_CONFIG_CONF_OPT = --with-installed-glib
|
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
|
@ -12,11 +12,9 @@ PKGCONF_LICENSE_FILES = COPYING
|
|||||||
|
|
||||||
PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config
|
PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_PKG_CONFIG),)
|
|
||||||
define PKGCONF_LINK_PKGCONFIG
|
define PKGCONF_LINK_PKGCONFIG
|
||||||
ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config
|
ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config
|
||||||
endef
|
endef
|
||||||
endif
|
|
||||||
|
|
||||||
define HOST_PKGCONF_INSTALL_WRAPPER
|
define HOST_PKGCONF_INSTALL_WRAPPER
|
||||||
$(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
|
$(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user