From cb6c0bafb1d4c910a4e8ce4c376462cc68bafacf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 20:41:36 +0100 Subject: fix compile for MIPS --- package/elinks/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/elinks/Makefile b/package/elinks/Makefile index eba5074..d4f3d86 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= elinks PKG_VERSION:= 0.11.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab PKG_DESCR:= advanced text web browser PKG_SECTION:= text @@ -17,6 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TCFLAGS+= -fPIC CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes -- cgit v0.11.2-3-g2eb4 From 9ccd133338a72a391ac7f9010bc5f7ec93f1ad20 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 20:42:03 +0100 Subject: update to 2.6.32 --- target/lemote/target.mk | 4 ++-- target/rb532/Makefile | 2 +- target/rb532/target.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/lemote/target.mk b/target/lemote/target.mk index 2702be9..db804bc 100644 --- a/target/lemote/target.mk +++ b/target/lemote/target.mk @@ -1,7 +1,7 @@ ARCH:= mips CPU_ARCH:= mips64el -KERNEL_VERSION:= 2.6.31.5 +KERNEL_VERSION:= 2.6.32 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=loongson2f -mabi=64 diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 9c590c0..f1b2566 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id kernel-install: - $(KERNEL_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),ext2-cf) diff --git a/target/rb532/target.mk b/target/rb532/target.mk index c0924be..95f0176 100644 --- a/target/rb532/target.mk +++ b/target/rb532/target.mk @@ -1,7 +1,7 @@ ARCH:= mips CPU_ARCH:= mipsel -KERNEL_VERSION:= 2.6.31.5 +KERNEL_VERSION:= 2.6.32 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=mips32 -- cgit v0.11.2-3-g2eb4 From 644de656b41be3def5d2d0f276f7e24c0b367ea1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 20:42:15 +0100 Subject: revert defconfig change, do not call always config -D --- mk/build.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mk/build.mk b/mk/build.mk index 2d1d4e0..53bd14d 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -248,7 +248,9 @@ endif ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig endif - @$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN) + @if [ ! -z "$(TARGET)" ];then \ + $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ + fi modconfig: @if [ ! -z "$(TARGET)" ];then \ -- cgit v0.11.2-3-g2eb4