1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb
index 600ec96673..c084ad2b73 100644
--- a/meta/recipes-devtools/distcc/distcc_3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.2.bb
@@ -7,10 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "avahi binutils"
-GTKCONFIG = "gtk"
+PACKAGECONFIG ??= "popt"
-GTKCONFIG_libc-uclibc = ""
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GTKCONFIG}', '', d)} popt"
 PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
 # use system popt by default
 PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"

diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb index 600ec96673..c084ad2b73 100644 --- a/meta/recipes-devtools/distcc/distcc_3.2.bb +++ b/meta/recipes-devtools/distcc/distcc_3.2.bb
@@ -7,10 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7		7
8	DEPENDS = "avahi binutils"	8	DEPENDS = "avahi binutils"
9		9
10	GTKCONFIG = "gtk"	10	PACKAGECONFIG ??= "popt"
11	GTKCONFIG_libc-uclibc = ""
12
13	PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GTKCONFIG}', '', d)} popt"
14	PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"	11	PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
15	# use system popt by default	12	# use system popt by default
16	PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"	13	PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"