Patchwork pkgconfig: remove out-dated configure options and dependencies

login
register
mail settings
Submitter Ross Burton
Date Jan. 28, 2014, 5:44 p.m.
Message ID <1390931044-24421-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/65973/
State New
Headers show

Comments

Ross Burton - Jan. 28, 2014, 5:44 p.m.
0.27 onwards uses a snapshot of glib 2 not glib 1, so drop the
do_configure_prepend and update the internal/installed options as appropriate.

Legacy scripts were removed in 0.26.

Use of popt was removed in 0.28.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/pkgconfig/pkgconfig.inc |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
Saul Wold - Jan. 28, 2014, 7:50 p.m.
Although not in this email a change to this patch seems to have removed 
the glibconfig-sysdefs.h file but not the entry in SRC_URI for the _0,28 
and _git recipes.

Not sure what happened with this, but master is not working and we 
should either revert this change or clean up the issue.

Thanks
	Sau!


On 01/28/2014 09:44 AM, Ross Burton wrote:
> 0.27 onwards uses a snapshot of glib 2 not glib 1, so drop the
> do_configure_prepend and update the internal/installed options as appropriate.
>
> Legacy scripts were removed in 0.26.
>
> Use of popt was removed in 0.28.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-devtools/pkgconfig/pkgconfig.inc |   12 ++++--------
>   1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> index 3e655a9..62c886f 100644
> --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
> @@ -8,7 +8,7 @@ SECTION = "console/utils"
>   LICENSE = "GPLv2+"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
> -DEPENDS = "glib-2.0 popt"
> +DEPENDS = "glib-2.0"
>   DEPENDS_class-native = ""
>   DEPENDS_class-nativesdk = ""
>
> @@ -18,15 +18,11 @@ S = "${WORKDIR}/pkg-config-${PV}/"
>
>   inherit autotools
>
> -EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts --with-internal-glib"
> -EXTRA_OECONF_class-native = "--disable-legacy-scripts --with-internal-glib"
> -EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts --with-internal-glib"
> +EXTRA_OECONF = "--without-internal-glib"
> +EXTRA_OECONF_class-native = "--with-internal-glib"
> +EXTRA_OECONF_class-nativesdk = "--with-internal-glib"
>
>   acpaths = "-I ."
> -do_configure_prepend () {
> -	mkdir --parents ${B}/glib-1.2.10
> -	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h ${B}/glib-1.2.10/
> -}
>
>   BBCLASSEXTEND = "native nativesdk"
>
>
Richard Purdie - Jan. 28, 2014, 10:34 p.m.
On Tue, 2014-01-28 at 11:50 -0800, Saul Wold wrote:
> Although not in this email a change to this patch seems to have removed 
> the glibconfig-sysdefs.h file but not the entry in SRC_URI for the _0,28 
> and _git recipes.
> 
> Not sure what happened with this, but master is not working and we 
> should either revert this change or clean up the issue.

Sorry, my fault, I messed with the commit and broke it. I've pushed a
fix.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 3e655a9..62c886f 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -8,7 +8,7 @@  SECTION = "console/utils"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "glib-2.0 popt"
+DEPENDS = "glib-2.0"
 DEPENDS_class-native = ""
 DEPENDS_class-nativesdk = ""
 
@@ -18,15 +18,11 @@  S = "${WORKDIR}/pkg-config-${PV}/"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts --with-internal-glib"
-EXTRA_OECONF_class-native = "--disable-legacy-scripts --with-internal-glib"
-EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts --with-internal-glib"
+EXTRA_OECONF = "--without-internal-glib"
+EXTRA_OECONF_class-native = "--with-internal-glib"
+EXTRA_OECONF_class-nativesdk = "--with-internal-glib"
 
 acpaths = "-I ."
-do_configure_prepend () {
-	mkdir --parents ${B}/glib-1.2.10
-	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h ${B}/glib-1.2.10/
-}
 
 BBCLASSEXTEND = "native nativesdk"