pkg-config: remove deprecated
PATCH v2 1/1 pkg-config: remove deprecated
--- package/Config.in | 1 - package/pkg-config/Config.in | 19 -------------- .../pkg-config/pkg-config-0.25-fix-variable.patch | 30 ---------------------- package/pkg-config/pkg-config.mk | 12 --------- package/pkgconf/pkgconf.mk | 2 -- 5 files changed, 64 deletions(-) delete mode 100644 package/pkg-config/Config.in delete mode 100644 package/pkg-config/pkg-config-0.25-fix-variable.patch delete mode 100644 package/pkg-config/pkg-config.mk
package/Config.in +0 -1
@@ -112,7 +112,6 @@ source "package/make/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/patch/Config.in" endif -source "package/pkg-config/Config.in" source "package/pkgconf/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/sed/Config.in"
package/pkg-config/Config.in deleted +0 -19
@@ -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
package/pkg-config/pkg-config-0.25-fix-variable.patch deleted +0 -30
@@ -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 <[email protected]> ---- - 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;
package/pkg-config/pkg-config.mk deleted +0 -12
@@ -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))
package/pkgconf/pkgconf.mk +0 -2
@@ -12,11 +12,9 @@ PKGCONF_LICENSE_FILES = COPYING PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config -ifeq ($(BR2_PACKAGE_PKG_CONFIG),) define PKGCONF_LINK_PKGCONFIG ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config endef -endif define HOST_PKGCONF_INSTALL_WRAPPER $(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
Signature · 1 line
1.8.3.2
PATCH v2 1/1 pkg-config: remove deprecated
Hi Gustavo,
Quoted 11 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>--- package/Config.in | 1 - package/pkg-config/Config.in | 19 -------------- .../pkg-config/pkg-config-0.25-fix-variable.patch | 30 ---------------------- package/pkg-config/pkg-config.mk | 12 --------- package/pkgconf/pkgconf.mk | 2 -- 5 files changed, 64 deletions(-) delete mode 100644 package/pkg-config/Config.in delete mode 100644 package/pkg-config/pkg-config-0.25-fix-variable.patch delete mode 100644 package/pkg-config/pkg-config.mk
Sorry that I didn't notice this the first time, but Makefile.legacy also still has a reference to host-pkg-config that needs to be removed.
Best regards,
Thomas
PATCH v2 1/1 pkg-config: remove deprecated
Quoted 3 lines · Thomas De Schampheleire
Sorry that I didn't notice this the first time, but Makefile.legacy also still has a reference to host-pkg-config that needs to be removed.
That i'd leave for a little longer since people patching some custom/random packages when upgrading their BR might get hit. Regards.
PATCH v2 1/1 pkg-config: remove deprecated
Quoted 7 lines · Gustavo Zacarias
Quoted 3 lines · Thomas De Schampheleire
Sorry that I didn't notice this the first time, but Makefile.legacy also still has a reference to host-pkg-config that needs to be removed.
That i'd leave for a little longer since people patching some custom/random packages when upgrading their BR might get hit.
There's not even a need to ever remove it from there, unless the file
becomes really really large.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 1/1 pkg-config: remove deprecated
In reply to Gustavo ZacariasDear Gustavo Zacarias,
Quoted 11 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>--- package/Config.in | 1 - package/pkg-config/Config.in | 19 -------------- .../pkg-config/pkg-config-0.25-fix-variable.patch | 30 ---------------------- package/pkg-config/pkg-config.mk | 12 --------- package/pkgconf/pkgconf.mk | 2 -- 5 files changed, 64 deletions(-) delete mode 100644 package/pkg-config/Config.in delete mode 100644 package/pkg-config/pkg-config-0.25-fix-variable.patch delete mode 100644 package/pkg-config/pkg-config.mk
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/1 pkg-config: remove deprecated
In reply to Gustavo ZacariasQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Signed-off-by Gustavo Zacarias <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard