summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/config/Config.in2
-rw-r--r--package/sash/Makefile2
-rw-r--r--package/sash/src/Makefile6
4 files changed, 6 insertions, 6 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 25dae3d21..a97c1ae3d 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -41,7 +41,7 @@ do-configure:
symbol=$$(echo $$sym|sed -e "s#=y##"); \
printf "# CONFIG_$${symbol} is not set\n" >> ${WRKBUILD}/.config; \
done
-ifneq ($(ADK_TARGET_WITH_MMU),y)
+ifeq ($(ADK_TARGET_WITHOUT_MMU),y)
echo 'CONFIG_NOMMU=y' >> ${WRKBUILD}/.config
endif
$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index f743bd59f..54d4e1120 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -518,7 +518,7 @@ config BUSYBOX_PIE
config BUSYBOX_NOMMU
bool "Force NOMMU build"
- default y if ADK_TARGET_UCLINUX
+ default y if ADK_TARGET_WITHOUT_MMU
default n
help
Busybox tries to detect whether architecture it is being
diff --git a/package/sash/Makefile b/package/sash/Makefile
index 337cb166c..5ea50432a 100644
--- a/package/sash/Makefile
+++ b/package/sash/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= sash
PKG_VERSION:= 1.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_DESCR:= standalone shell
PKG_SECTION:= base/shells
diff --git a/package/sash/src/Makefile b/package/sash/src/Makefile
index 90d6adf99..a7bd5894a 100644
--- a/package/sash/src/Makefile
+++ b/package/sash/src/Makefile
@@ -19,13 +19,13 @@ CFLAGS += -DCOMMAND_HISTORY
all: $(SH) $(SHUTDOWN) $(REBOOT)
$(SH): $(SHOBJS) $(LIBSASH)
- $(CC) $(LDFLAGS) -o $@ $(SHOBJS) $(LIBSASH) $(LDLIBS$(LDLIBS_$@))
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SHOBJS) $(LIBSASH) $(LDLIBS$(LDLIBS_$@))
$(SHUTDOWN): $(SHUTDOWNOBJS) $(LIBSASH)
- $(CC) $(LDFLAGS) -o $@ $(SHUTDOWNOBJS) $(LIBSASH) $(LDLIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SHUTDOWNOBJS) $(LIBSASH) $(LDLIBS)
$(REBOOT): $(REBOOTOBJS) $(LIBSASH)
- $(CC) $(LDFLAGS) -o $@ $(REBOOTOBJS) $(LIBSASH) $(LDLIBS$(LDLIBS_$@))
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(REBOOTOBJS) $(LIBSASH) $(LDLIBS$(LDLIBS_$@))
dummy_target: