From 4239d26536021619954bca5b67fb03bd48b24c15 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 05:52:22 +0200 Subject: allow vpx on lemote --- package/libvpx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index ddc595272..afb3b50a0 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= libs PKG_URL:= http://www.webmproject.org/about/ PKG_SITES:= http://webm.googlecode.com/files/ -PKG_SYSTEM_DEPENDS:= sharp-zaurus ibm-x40 +PKG_SYSTEM_DEPENDS:= sharp-zaurus ibm-x40 lemote-yeelong DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}-p1.tar.bz2 WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}-p1 -- cgit v1.2.3 From b3b93b5d6c43789bbd0d4bc5bac2900609ca4087 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 05:54:51 +0200 Subject: respect choosen ABI --- package/eglibc/Makefile | 9 +++++++++ package/eglibc/files/libc.so.mips | 2 +- package/gcc/Makefile | 8 +++++--- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 5bf290fe9..5466ddb85 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -91,6 +91,15 @@ eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib # install linker script -cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +ifeq ($(ADK_TARGET_ABI_O32),y) + $(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +endif +ifeq ($(ADK_TARGET_ABI_N32),y) + $(SED) "s#@@ELFFORMAT@@#elf32-ntradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +endif +ifeq ($(ADK_TARGET_ABI_N64),y) + $(SED) "s#@@ELFFORMAT@@#elf64-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +endif ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib -for file in libc libcrypt libdl libm libresolv librt libutil; do \ diff --git a/package/eglibc/files/libc.so.mips b/package/eglibc/files/libc.so.mips index 6165d3e9c..9e73ea39c 100644 --- a/package/eglibc/files/libc.so.mips +++ b/package/eglibc/files/libc.so.mips @@ -1,5 +1,5 @@ /* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf64-tradlittlemips) + OUTPUT_FORMAT(@@ELFTARGET@@) GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) ) diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 6158d094f..8a6e267c8 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -20,8 +20,11 @@ TARGET_CPPFLAGS:= '' TARGET_CFLAGS:= '' TARGET_CXXFLAGS:= $(filter-out -fstack-protector,$(TARGET_CXXFLAGS)) -ifeq ($(ADK_LINUX_64),y) -CONFIGURE_ARGS+= --with-abi=64 +#ifeq ($(ADK_LINUX_64),y) +#CONFIGURE_ARGS+= --with-abi=64 +#endif +ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) +CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI) endif CONFIGURE_ARGS+= --enable-languages=c,c++ \ @@ -51,7 +54,6 @@ post-install: cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++ cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc ${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/ - ${CP} ${WRKINST}/usr/lib/libstdc++*so* ${IDIR_GCC}/usr/lib/ ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/ cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp . ${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/ -- cgit v1.2.3 From 607664573b192e16f95939b4ad2c41d8f098e2ae Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 05:55:32 +0200 Subject: firefox honours cflags, testing on lemote again --- package/firefox/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'package') diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 0c8de9916..942034570 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -19,9 +19,9 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_ PKG_NOPARALLEL:= 1 PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= x86 x86_64 native +PKG_ARCH_DEPENDS:= x86 x86_64 native mips PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin -PKG_SYSTEM_DEPENDS:= ibm-x40 +PKG_SYSTEM_DEPENDS:= ibm-x40 lemote-yeelong DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-release @@ -30,9 +30,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -# disable honour cflags stuff -XAKE_FLAGS+= GCC_HONOUR_COPTS=s - CONFIGURE_ENV+= CROSS_COMPILE=1 \ HOST_CC="${CC_FOR_BUILD}" \ HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \ -- cgit v1.2.3 From 722eee7d945f1299eb6bdc3139938b3df55a1bf5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 06:27:53 +0200 Subject: avoid test directory --- package/openssl/patches/patch-Makefile_org | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/openssl/patches/patch-Makefile_org (limited to 'package') diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org new file mode 100644 index 000000000..f72030d14 --- /dev/null +++ b/package/openssl/patches/patch-Makefile_org @@ -0,0 +1,11 @@ +--- openssl-1.0.0d.orig/Makefile.org 2010-01-27 17:06:58.000000000 +0100 ++++ openssl-1.0.0d/Makefile.org 2011-10-12 06:07:40.993200000 +0200 +@@ -109,7 +109,7 @@ LIBKRB5= + ZLIB_INCLUDE= + LIBZLIB= + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl engines apps tools + ENGDIRS= ccgost + SHLIBDIRS= crypto ssl + -- cgit v1.2.3 From f28fcf0e878ed04a29d76080954f94709b77a980 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 07:55:50 +0200 Subject: add toolchain patch to package, too --- package/gcc/patches/no-lib64.patch | 100 +++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 package/gcc/patches/no-lib64.patch (limited to 'package') diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch new file mode 100644 index 000000000..5c6e0b045 --- /dev/null +++ b/package/gcc/patches/no-lib64.patch @@ -0,0 +1,100 @@ +diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/linux64.h +--- gcc-4.5.3.orig/gcc/config/i386/linux64.h 2010-03-24 21:44:48.000000000 +0100 ++++ gcc-4.5.3/gcc/config/i386/linux64.h 2011-08-24 06:35:30.000000000 +0200 +@@ -59,7 +59,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" +diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-linux64 +--- gcc-4.5.3.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200 ++++ gcc-4.5.3/gcc/config/i386/t-linux64 2011-08-24 06:35:30.000000000 +0200 +@@ -25,7 +25,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/linux64.h +--- gcc-4.5.3.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 ++++ gcc-4.5.3/gcc/config/mips/linux64.h 2011-08-24 06:35:30.000000000 +0200 +@@ -36,9 +36,9 @@ + %{profile:-lc_p} %{!profile:-lc}}" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) + +diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-linux64 +--- gcc-4.5.3.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200 ++++ gcc-4.5.3/gcc/config/mips/t-linux64 2011-08-24 06:35:30.000000000 +0200 +@@ -18,7 +18,7 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib ../lib + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + +diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000/linux64.h +--- gcc-4.5.3.orig/gcc/config/rs6000/linux64.h 2010-11-17 07:09:53.000000000 +0100 ++++ gcc-4.5.3/gcc/config/rs6000/linux64.h 2011-08-24 06:35:30.000000000 +0200 +@@ -341,7 +341,7 @@ + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" + #if UCLIBC_DEFAULT +diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000/t-linux64 +--- gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 2009-04-21 21:03:23.000000000 +0200 ++++ gcc-4.5.3/gcc/config/rs6000/t-linux64 2011-08-24 06:35:30.000000000 +0200 +@@ -36,7 +36,7 @@ + MULTILIB_EXTRA_OPTS = fPIC mstrict-align + MULTILIB_EXCEPTIONS = m64/msoft-float + MULTILIB_EXCLUSIONS = m64/!m32/msoft-float +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof + MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) + + softfp_wrap_start := '\#ifndef __powerpc64__' +diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/linux64.h +--- gcc-4.5.3.orig/gcc/config/sparc/linux64.h 2010-09-22 23:15:37.000000000 +0200 ++++ gcc-4.5.3/gcc/config/sparc/linux64.h 2011-08-24 06:36:52.000000000 +0200 +@@ -110,7 +110,7 @@ + /* If ELF is the default format, we should not use /lib/elf. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" + + #ifdef SPARC_BI_ARCH + +diff -Nur gcc-4.5.3.orig/gcc/config/sparc/t-linux64 gcc-4.5.3/gcc/config/sparc/t-linux64 +--- gcc-4.5.3.orig/gcc/config/sparc/t-linux64 2010-10-04 18:54:26.000000000 +0200 ++++ gcc-4.5.3/gcc/config/sparc/t-linux64 2011-08-24 06:37:15.000000000 +0200 +@@ -26,7 +26,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib -- cgit v1.2.3