From fbe47cba997e4f2f2dbaa6af0583dbec2e5d130c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 2 Nov 2013 12:03:09 +0100 Subject: remove dependencies to libiconv,pkg-config and file. use pkgconf and libiconv-tiny instead. fixes glib compile on systems without libiconv/ native iconv implementation --- target/packages/pkg-available/development | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'target') diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 143166acd..72e0777ce 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -25,10 +25,8 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_MAKE select ADK_PACKAGE_MKFONTDIR select ADK_PACKAGE_PATCH - select ADK_PACKAGE_PKG_CONFIG + select ADK_PACKAGE_PKGCONF select ADK_PACKAGE_MICROPERL - select ADK_PACKAGE_TSORT - select BUSYBOX_PATCH select BUSYBOX_STAT select BUSYBOX_FEATURE_STAT_FORMAT select BUSYBOX_FEATURE_DD_IBS_OBS -- cgit v1.2.3 From 22e24d73762b2cfc79797f94d9e2d9e3f070c418 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Nov 2013 13:51:33 +0100 Subject: resolve merge conflict --- target/arm/sys-available/raspberry-pi | 1 - target/packages/pkg-available/mpdbox | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'target') diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 846f0fcf8..b8753c36d 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -15,7 +15,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_INPUT select ADK_PACKAGE_BCM2835_FIRMWARE select ADK_PACKAGE_BCM2835_VC - select ADK_KERNEL_SWAP help Raspberry PI diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index d3e73cb6b..810d546e5 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -34,6 +34,7 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_PHP select ADK_PACKAGE_PHP_MOD_SESSION select ADK_PACKAGE_PHP_MOD_JSON + select ADK_PACKAGE_PHP_MOD_CURL select ADK_PACKAGE_PHP_FASTCGI select ADK_PACKAGE_SCREEN select ADK_PACKAGE_VIM -- cgit v1.2.3