diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 20:09:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 20:09:09 +0200 |
| commit | 9d8ce74086152a6431f92e95533a31a0cd6b2d23 (patch) | |
| tree | 114dea73035cef5daa129fec4da31febf292dd66 /mk | |
| parent | d797df53c90b50b326fb0f39a6928e207e1cbe1d (diff) | |
| parent | 4fa46b6a63a479a7a216b519c329dbfe53b0ca39 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | mk/package.mk | 5 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 3 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 943225bdb..10f9a6266 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -905,8 +905,10 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ ZLIB:=lib/zlib_deflate/zlib_deflate ifeq ($(ADK_LINUX_CRIS_FOXBOARD),) +ifeq ($(ADK_LINUX_MIPS_AG241),) ZLIB+=lib/zlib_inflate/zlib_inflate endif +endif $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ $(foreach mod, $(ZLIB),$(MODULES_DIR)/kernel/$(mod)) \ diff --git a/mk/package.mk b/mk/package.mk index ee58b6957..30965e17b 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -42,11 +42,6 @@ endif ifeq ($(filter minimal,${CONFIG_STYLE}),) ifneq ($(ADK_DEBUG),) CONFIGURE_ARGS+= --enable-debug -else -CONFIGURE_ARGS+= --disable-debug -endif -ifeq ($(ADK_ENABLE_IPV6),y) -CONFIGURE_ARGS+= --enable-ipv6 endif endif diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 466a4c398..101a240a9 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -129,8 +129,7 @@ post-install: ${_FAKE_COOKIE}: ${_BUILD_COOKIE} -rm -f ${_ALL_CONTROLS} @mkdir -p '${STAGING_PARENT}/pkg' ${WRKINST} '${STAGING_DIR}/scripts' - @mkdir -p ${WRKINST}/{sbin,bin,etc,lib} - @mkdir -p ${WRKINST}/usr/{sbin,bin,etc,lib} + @mkdir -p ${WRKINST}/{sbin,bin,etc,lib} ${WRKINST}/usr/{sbin,bin,lib} @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) @env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE) ifneq ($(filter manual,${INSTALL_STYLE}),) diff --git a/mk/vars.mk b/mk/vars.mk index 78b37fbbe..fdd9f432c 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -14,7 +14,7 @@ TARGET_DEBUGGING:= -g3 -fno-omit-frame-pointer else TARGET_DEBUGGING:= -fomit-frame-pointer $(TARGET_OPTIMIZATION) endif -TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) +TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv ifneq ($(ADK_TARGET_ARCH_OPTIMIZATION),) TARGET_CFLAGS+= -march=$(ADK_TARGET_ARCH_OPTIMIZATION) endif |