1
0
Quellcode durchsuchen

Merge branch 'master' of ableton-dir/openadk into master

Waldemar Brodkorb vor 7 Jahren
Ursprung
Commit
9072503b2c
5 geänderte Dateien mit 58 neuen und 1 gelöschten Zeilen
  1. 1 1
      Makefile
  2. 6 0
      Makefile.adk
  3. 9 0
      mk/build.mk
  4. 11 0
      package/python3/patches/patch-setup_py
  5. 31 0
      package/stress-ng/Makefile

+ 1 - 1
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}

+ 6 - 0
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

+ 9 - 0
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"

+ 11 - 0
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

+ 31 - 0
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
+