From 03cd5dffd5f121c952016a5510736922f6283f6b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 24 Aug 2009 21:46:04 +0200 Subject: add gawk package another openadk build package needed to compile openadk on an openadk target ;) Fix some minor glitches. --- mk/pkg-bottom.mk | 2 +- package/Config.in | 1 + package/Makefile | 1 + package/gawk/Config.in | 6 ++++++ package/gawk/Makefile | 28 ++++++++++++++++++++++++++++ package/gcc/Makefile | 1 + target/Config.in | 1 + target/lemote/patches/yeelong.patch | 12 ++++++++++-- 8 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 package/gawk/Config.in create mode 100644 package/gawk/Makefile diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 1e3514c52..ccd629218 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -124,7 +124,7 @@ endif fi @rm -f '${STAGING_PARENT}/pkg/${PKG_NAME}' @cd ${WRKINST}; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ diff --git a/package/Config.in b/package/Config.in index f724af03a..8507fef02 100644 --- a/package/Config.in +++ b/package/Config.in @@ -75,6 +75,7 @@ source "package/bzip2/Config.in" source "package/collectd/Config.in" source "package/deco/Config.in" source "package/digitemp/Config.in" +source "package/gawk/Config.in" source "package/gpm/Config.in" source "package/gpsd/Config.in" source "package/logrotate/Config.in" diff --git a/package/Makefile b/package/Makefile index 66286e1af..85768df9e 100644 --- a/package/Makefile +++ b/package/Makefile @@ -103,6 +103,7 @@ package-$(ADK_COMPILE_FREETYPE) += freetype package-$(ADK_PACKAGE_FRICKIN) += frickin package-$(ADK_COMPILE_FUSE) += fuse package-$(ADK_PACKAGE_GATLING) += gatling +package-$(ADK_PACKAGE_GAWK) += gawk package-$(ADK_PACKAGE_GCC) += gcc package-$(ADK_PACKAGE_GDB) += gdb package-$(ADK_PACKAGE_GDBSERVER) += gdbserver diff --git a/package/gawk/Config.in b/package/gawk/Config.in new file mode 100644 index 000000000..2ef88947b --- /dev/null +++ b/package/gawk/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_GAWK + prompt "gawk.............................. GNU awk" + tristate + default n + help + http://www.gnu.org/software/gawk/ diff --git a/package/gawk/Makefile b/package/gawk/Makefile new file mode 100644 index 000000000..e47aad514 --- /dev/null +++ b/package/gawk/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= gawk +PKG_VERSION:= 3.1.7 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a38d5dec19320ace01f1d16c8beb1363 +PKG_DESCR:= GNU awk +PKG_SECTION:= utils +PKG_URL:= http://www.gnu.org/software/gawk/ +PKG_SITES:= ${MASTER_SITE_GNU:=gawk/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,GAWK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-libsigsegv +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_GAWK}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/gawk ${IDIR_GAWK}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 28bea06bf..c348c9b4b 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -46,6 +46,7 @@ ifeq ($(ADK_TARGET_LIB_UCLIBC),y) else ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib endif + rm ${IDIR_GCC}/usr/lib/gcc/*/*/crtendS.o rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools diff --git a/target/Config.in b/target/Config.in index 22e5ef727..1db490b1b 100644 --- a/target/Config.in +++ b/target/Config.in @@ -509,6 +509,7 @@ config ADK_DEVELSYSTEM select ADK_PACKAGE_BINUTILS select ADK_PACKAGE_TAR select ADK_PACKAGE_BZIP2 + select ADK_PACKAGE_GAWK help After bootstrapping a Linux system you might want to switch to native builds with your target. diff --git a/target/lemote/patches/yeelong.patch b/target/lemote/patches/yeelong.patch index 3718e990e..5909a579e 100644 --- a/target/lemote/patches/yeelong.patch +++ b/target/lemote/patches/yeelong.patch @@ -11007,8 +11007,16 @@ diff -Nur linux-2.6.30.5.orig/arch/mips/Kconfig linux-2.6.30.5/arch/mips/Kconfig source "drivers/Kconfig" diff -Nur linux-2.6.30.5.orig/arch/mips/kernel/asm-offsets.c linux-2.6.30.5/arch/mips/kernel/asm-offsets.c --- linux-2.6.30.5.orig/arch/mips/kernel/asm-offsets.c 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/arch/mips/kernel/asm-offsets.c 2009-08-23 21:23:19.000000000 +0200 -@@ -326,3 +326,15 @@ ++++ linux-2.6.30.5/arch/mips/kernel/asm-offsets.c 2009-08-23 21:30:52.000000000 +0200 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -326,3 +327,15 @@ BLANK(); } #endif -- cgit v1.2.3