summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/kodi/Makefile1
-rw-r--r--package/uclibc-ng/Makefile7
2 files changed, 5 insertions, 3 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 4ffffbc18..7a0a14640 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -177,6 +177,7 @@ pre-configure:
(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
pre-build:
+ PATH=$(HOST_PATH) \
make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
-C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile
index adf9140d4..e8a28d148 100644
--- a/package/uclibc-ng/Makefile
+++ b/package/uclibc-ng/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= embedded c library
PKG_SECTION:= base/libs
PKG_OPTS:= noremove nostaging noscripts
PKG_VERSION:= 1.0.0-git
+PKG_VER:= 1.0.0
PKG_SUBPKGS:= UCLIBC_NG UCLIBC_NG_DEV UCLIBC_NG_TEST
PKGSD_UCLIBC_NG_DEV:= development files for uclibc-ng
@@ -67,7 +68,7 @@ uclibc-ng-dev-install:
$(KERNEL_MAKE_OPTS) \
INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr \
headers_install
- $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_DIR)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
+ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER} \
PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \
DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \
@@ -81,9 +82,9 @@ uclibc-ng-test-install:
${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc
echo '00:11:22:33:44:55 teeth' > ${IDIR_UCLIBC_NG_TEST}/etc/ethers
${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
- ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/test \
+ ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/test \
${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
- ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/{Rules.mak,.config} \
+ ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/{Rules.mak,.config} \
${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
@find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -exec rm {} \;