summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-11-16 13:39:15 +0100
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-11-16 13:49:53 +0100
commitdac2367b6221dab5bd367094534b981867e9891b (patch)
treec39748c8c69b0cc239fe29019524c9c815f65ba9
parentcb29cd60572b7d886b93eeacf38546198ef460db (diff)
downloadmidipix_build-dac2367b6221dab5bd367094534b981867e9891b.tar.bz2
midipix_build-dac2367b6221dab5bd367094534b981867e9891b.tar.xz
apk-tools: correctly provide $PKG_CONFIG.
-rw-r--r--patches/apk-tools-2.6.6.local.patch12
-rw-r--r--vars/build.vars2
2 files changed, 4 insertions, 10 deletions
diff --git a/patches/apk-tools-2.6.6.local.patch b/patches/apk-tools-2.6.6.local.patch
index df03820e..a5203706 100644
--- a/patches/apk-tools-2.6.6.local.patch
+++ b/patches/apk-tools-2.6.6.local.patch
@@ -27,15 +27,9 @@
CFLAGS_ALL += $(CFLAGS)
LDFLAGS ?= -g
---- apk-tools-2.6.6/src/Makefile.orig 2016-02-09 14:57:53.000000000 +0000
-+++ apk-tools-2.6.6/src/Makefile 2016-06-23 08:14:37.843747529 +0000
-@@ -1,12 +1,12 @@
- PKGDEPS := openssl zlib
--PKG_CONFIG ?= pkg-config
-+PKG_CONFIG ?= $(PKG_TARGET)-pkg-config
- LUAAPK ?= yes
-
- # lua module
+--- apk-tools-2.6.6/src/Makefile.orig 2016-02-09 15:57:53.000000000 +0100
++++ apk-tools-2.6.6/src/Makefile 2016-11-16 13:49:33.370051100 +0100
+@@ -6,7 +6,7 @@
ifneq ($(LUAAPK),)
LUA_VERSION ?= 5.2
LUA_PC ?= lua$(LUA_VERSION)
diff --git a/vars/build.vars b/vars/build.vars
index 734b8b75..eb54da41 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -406,7 +406,7 @@ grep hexcurse htop inetutils infounzip infozip irssi john less lynx make man_db
openssh p7zip pacman patch perl procps_ng python3 rsync rxvt_unicode sed tar tcsh the_silver_searcher
tmux util_linux vim weechat which whois xeyes xwd zsh";
LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
-: ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:CROSS_COMPILE=${TARGET}-:LUAAPK=:VERBOSE=1:PREFIX=${PREFIX_NATIVE}};
+: ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:CROSS_COMPILE=${TARGET}-:LUAAPK=:VERBOSE=1:PREFIX=${PREFIX_NATIVE}:PKG_CONFIG=${TARGET}-pkg-config};
: ${PKG_APK_TOOLS_MAKEFLAGS_INSTALL_EXTRA:=MANDIR=/share/man DOCDIR=/share/doc/apk};
: ${PKG_APK_TOOLS_SHA256SUM:=7e5e86c856ce236c7fd54605ee0b1dbf59920398d3b33f9f6ff0e5f98e6828af};
: ${PKG_APK_TOOLS_VERSION:=2.6.6};