* [Buildroot] [PATCHv2] pkg-config: remove deprecated
@ 2013-12-05 12:52 Gustavo Zacarias
2013-12-05 13:06 ` Thomas De Schampheleire
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2013-12-05 12:52 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
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
diff --git a/package/Config.in b/package/Config.in
index 29786d0..3c98c50 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
deleted file mode 100644
index 52c0c32..0000000
--- a/package/pkg-config/Config.in
+++ /dev/null
@@ -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
diff --git a/package/pkg-config/pkg-config-0.25-fix-variable.patch b/package/pkg-config/pkg-config-0.25-fix-variable.patch
deleted file mode 100644
index 13a2b91..0000000
--- a/package/pkg-config/pkg-config-0.25-fix-variable.patch
+++ /dev/null
@@ -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;
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
deleted file mode 100644
index a80d7cb..0000000
--- a/package/pkg-config/pkg-config.mk
+++ /dev/null
@@ -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))
diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
index 3ff093f..f3f6526 100644
--- a/package/pkgconf/pkgconf.mk
+++ b/package/pkgconf/pkgconf.mk
@@ -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 \
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] pkg-config: remove deprecated
2013-12-05 12:52 [Buildroot] [PATCHv2] pkg-config: remove deprecated Gustavo Zacarias
@ 2013-12-05 13:06 ` Thomas De Schampheleire
2013-12-05 13:08 ` Gustavo Zacarias
2013-12-05 17:27 ` Thomas Petazzoni
2013-12-05 23:05 ` Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Thomas De Schampheleire @ 2013-12-05 13:06 UTC (permalink / raw)
To: buildroot
Hi Gustavo,
On Thu, Dec 5, 2013 at 1:52 PM, Gustavo Zacarias
<gustavo@zacarias.com.ar> wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] pkg-config: remove deprecated
2013-12-05 13:06 ` Thomas De Schampheleire
@ 2013-12-05 13:08 ` Gustavo Zacarias
2013-12-05 22:23 ` Arnout Vandecappelle
0 siblings, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2013-12-05 13:08 UTC (permalink / raw)
To: buildroot
On 12/05/2013 10:06 AM, Thomas De Schampheleire wrote:
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] pkg-config: remove deprecated
2013-12-05 12:52 [Buildroot] [PATCHv2] pkg-config: remove deprecated Gustavo Zacarias
2013-12-05 13:06 ` Thomas De Schampheleire
@ 2013-12-05 17:27 ` Thomas Petazzoni
2013-12-05 23:05 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-12-05 17:27 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On Thu, 5 Dec 2013 09:52:40 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> 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
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] pkg-config: remove deprecated
2013-12-05 13:08 ` Gustavo Zacarias
@ 2013-12-05 22:23 ` Arnout Vandecappelle
0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2013-12-05 22:23 UTC (permalink / raw)
To: buildroot
On 05/12/13 14:08, Gustavo Zacarias wrote:
> On 12/05/2013 10:06 AM, Thomas De Schampheleire wrote:
>> 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
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv2] pkg-config: remove deprecated
2013-12-05 12:52 [Buildroot] [PATCHv2] pkg-config: remove deprecated Gustavo Zacarias
2013-12-05 13:06 ` Thomas De Schampheleire
2013-12-05 17:27 ` Thomas Petazzoni
@ 2013-12-05 23:05 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2013-12-05 23:05 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-05 23:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-05 12:52 [Buildroot] [PATCHv2] pkg-config: remove deprecated Gustavo Zacarias
2013-12-05 13:06 ` Thomas De Schampheleire
2013-12-05 13:08 ` Gustavo Zacarias
2013-12-05 22:23 ` Arnout Vandecappelle
2013-12-05 17:27 ` Thomas Petazzoni
2013-12-05 23:05 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox