diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-10 19:03:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-10 19:03:11 +0100 |
| commit | 713dc7012af249b7102faabb27e0fe88ea39be57 (patch) | |
| tree | 2626b2aa8f2ebb6e6c314ccdba45d7668ed122fd /mk | |
| parent | da5c3b1c8535d8f8455b5283ddaf5c38b45d477e (diff) | |
fix make bulk on OpenADK buildserver
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | mk/python.mk | 5 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/mk/build.mk b/mk/build.mk index d81485cf2..bbe632a12 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -20,11 +20,17 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_OPENJDK=n \ + ADK_PACKAGE_RUBY=n \ ADK_PACKAGE_CLASSPATH=n \ + ADK_PACKAGE_PCMANFM=n \ + ADK_PACKAGE_GPSD=n \ + ADK_PACKAGE_GPSD_CLIENTS=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ ADK_PACKAGE_PYTHON=n \ + ADK_PACKAGE_VIRTINST=n \ + ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PKG_LAPTOP=n \ ADK_PKG_DEVELOPMENT=n \ diff --git a/mk/python.mk b/mk/python.mk index 5767b12f7..933bd0065 100644 --- a/mk/python.mk +++ b/mk/python.mk @@ -1,3 +1,8 @@ PYTHON_VERSION=2.7 +ifeq ($(ADK_NATIVE),) PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib PYTHON:=${STAGING_HOST_DIR}/usr/bin/hostpython +else +PYTHON_LIBDIR:=/usr/lib +PYTHON:=/usr/bin/python +endif diff --git a/mk/vars.mk b/mk/vars.mk index 896307026..bdfd333ad 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -135,6 +135,7 @@ check_gcc=$(shell \ CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) # host compiler flags +CXX_FOR_BUILD?= g++ CPPFLAGS_FOR_BUILD?= CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) CXXFLAGS_FOR_BUILD?= -O2 -Wall @@ -165,6 +166,7 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ + CXX_FOR_BUILD='${CXX_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \ QEMU='$(QEMU)' |