summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2017-06-23 00:31:58 +0200
committerGogs <gogs@fake.local>2017-06-23 00:31:58 +0200
commit9072503b2c2f486979e08c86ce37f4a37508a931 (patch)
tree2154de01b6781f414fa225f3294e0a521d45f6fc
parentf352d0cffd9f88bbafdd768e64d3754ea5c27296 (diff)
parentc2721d89883911785617d11b014d71b6ab50c540 (diff)
Merge branch 'master' of ableton-dir/openadk into master
-rw-r--r--Makefile2
-rw-r--r--Makefile.adk6
-rw-r--r--mk/build.mk9
-rw-r--r--package/python3/patches/patch-setup_py11
-rw-r--r--package/stress-ng/Makefile31
5 files changed, 58 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bdab1564a..c7954e646 100644
--- a/Makefile
+++ b/Makefile
@@ -4,5 +4,5 @@
# GNU make and BSD make compatible make file wrapper
MAKECMDGOALS+= ${.TARGETS}
-all v allmodconfig allnoconfig allyesconfig help pkg-help dev-help targethelp kernelconfig savekconfig image menuconfig defconfig oldconfig download clean cleankernel cleansystem cleandir distclean hostclean hostpackage fetch package extract patch dep menu newpackage host-update-patches update-patches:
+all v allmodconfig allnoconfig allyesconfig help pkg-help dev-help targethelp kernelconfig savekconfig image menuconfig defconfig oldconfig download clean cleankernel cleansystem cleandir distclean hostclean hostpackage fetch package extract patch dep menu newpackage host-update-patches update-patches info:
@./scripts/prereq.sh ${MAKECMDGOALS}
diff --git a/Makefile.adk b/Makefile.adk
index 0938316ba..95aed94fd 100644
--- a/Makefile.adk
+++ b/Makefile.adk
@@ -13,6 +13,8 @@ subdir:= package/${package}
_subdir_dep:= ${ADK_TOPDIR}/.config
endif
+include $(ADK_TOPDIR)/rules.mk
+
ifneq (${subdir},)
${MAKECMDGOALS}: _subdir
@@ -180,5 +182,9 @@ dep:
world:
@${GMAKE_INV} world
+
+info:
+ @${GMAKE_INV} info
+
endif
# DO NOT DELETE
diff --git a/mk/build.mk b/mk/build.mk
index 3bbcc220d..de911508c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -652,3 +652,12 @@ check-g++: check-dejagnu
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc -k check-c++
check: check-gcc check-g++
+
+info:
+ @printf -- "---OPENADK-INFO---\n"
+ @printf "ADK_TOPDIR=$(ADK_TOPDIR)\n"
+ @printf "TARGET_COMPILER_PREFIX=${TARGET_COMPILER_PREFIX}\n"
+ @printf "TOOLCHAIN_DIR=$(TOOLCHAIN_DIR)\n"
+ @printf "TARGET_PATH=$(TARGET_PATH)\n"
+ @printf "LINUX_DIR=$(LINUX_DIR)\n"
+ @printf -- "---OPENADK-INFO---\n"
diff --git a/package/python3/patches/patch-setup_py b/package/python3/patches/patch-setup_py
new file mode 100644
index 000000000..bb60fb9b4
--- /dev/null
+++ b/package/python3/patches/patch-setup_py
@@ -0,0 +1,11 @@
+--- Python-3.6.0.orig/setup.py 2016-12-23 03:21:22.000000000 +0100
++++ Python-3.6.0/setup.py 2017-05-10 17:22:50.000000000 +0200
+@@ -532,7 +532,7 @@ class PyBuildExt(build_ext):
+ for directory in reversed(options.dirs):
+ add_dir_to_list(dir_list, directory)
+
+- if os.path.normpath(sys.base_prefix) != '/usr' \
++ if not cross_compiling and os.path.normpath(sys.base_prefix) != '/usr' \
+ and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
+ # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+ # (PYTHONFRAMEWORK is set) to avoid # linking problems when
diff --git a/package/stress-ng/Makefile b/package/stress-ng/Makefile
new file mode 100644
index 000000000..aece6e635
--- /dev/null
+++ b/package/stress-ng/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${ADK_TOPDIR}/rules.mk
+
+PKG_NAME:= stress-ng
+PKG_VERSION:= 0.07.29
+PKG_RELEASE:= 1
+PKG_HASH:= 71a9555d1d9ee0a4a9bca9ee14294289ee77e998a951c7071df6cc8e153d8410
+PKG_DESCR:= stress-ng will stress test a computer system in various selectable ways
+PKG_SECTION:= sys/utils
+PKG_SITES:= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+include ${ADK_TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,STRESS_NG,stress-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+
+stress-ng-install:
+ ${INSTALL_DIR} ${IDIR_STRESS_NG}/usr/bin/
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/stress-ng ${IDIR_STRESS_NG}/usr/bin/
+
+do-build:
+ PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} stress-ng
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+