From a8c14536161a7f62f06beb5928acfd78691bef78 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 26 Apr 2011 12:50:25 +0200 Subject: make arm/mips architectures more configurable in a simpler way --- package/firefox/Makefile | 2 +- package/firefox/patches/patch-js_src_Makefile_in | 11 ++++++ package/gcc/patches/no-lib64.patch | 47 ------------------------ package/nss/Makefile | 4 +- 4 files changed, 14 insertions(+), 50 deletions(-) create mode 100644 package/firefox/patches/patch-js_src_Makefile_in delete mode 100644 package/gcc/patches/no-lib64.patch (limited to 'package') diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 81c97c511..e57bf9bcf 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -29,7 +29,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq (${ADK_LINUX_MIPS64EL},y) +ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --disable-ipc else ifeq (${ADK_TARGET_LIB_UCLIBC},y) CONFIGURE_ARGS+= --disable-ipc diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in new file mode 100644 index 000000000..483f95418 --- /dev/null +++ b/package/firefox/patches/patch-js_src_Makefile_in @@ -0,0 +1,11 @@ +--- mozilla-2.0.orig/js/src/Makefile.in 2011-03-19 00:33:47.000000000 +0100 ++++ mozilla-2.0/js/src/Makefile.in 2011-04-24 19:54:11.707672834 +0200 +@@ -375,7 +375,7 @@ CPPSRCS += checks.cc \ + # END enclude sources for V8 dtoa + ############################################# + +-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU))) ++ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU))) + + VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch deleted file mode 100644 index add17ecb8..000000000 --- a/package/gcc/patches/no-lib64.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Nur gcc-4.4.1.orig/gcc/config/i386/linux64.h gcc-4.4.1/gcc/config/i386/linux64.h ---- gcc-4.4.1.orig/gcc/config/i386/linux64.h 2009-04-10 01:23:07.000000000 +0200 -+++ gcc-4.4.1/gcc/config/i386/linux64.h 2009-08-21 18:34:13.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" - - #undef ASM_SPEC - #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ -diff -Nur gcc-4.4.1.orig/gcc/config/i386/t-linux64 gcc-4.4.1/gcc/config/i386/t-linux64 ---- gcc-4.4.1.orig/gcc/config/i386/t-linux64 2008-07-02 17:59:19.000000000 +0200 -+++ gcc-4.4.1/gcc/config/i386/t-linux64 2009-08-21 18:34:13.000000000 +0200 -@@ -7,7 +7,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.4.1.orig/gcc/config/mips/linux64.h gcc-4.4.1/gcc/config/mips/linux64.h ---- gcc-4.4.1.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 -+++ gcc-4.4.1/gcc/config/mips/linux64.h 2009-08-21 18:37:19.000000000 +0200 -@@ -36,7 +36,7 @@ - %{profile:-lc_p} %{!profile:-lc}}" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" - #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" - #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" - #define LINUX_DYNAMIC_LINKERN32 \ -diff -Nur gcc-4.4.1.orig/gcc/config/mips/t-linux64 gcc-4.4.1/gcc/config/mips/t-linux64 ---- gcc-4.4.1.orig/gcc/config/mips/t-linux64 2006-06-06 14:51:24.000000000 +0200 -+++ gcc-4.4.1/gcc/config/mips/t-linux64 2009-08-21 18:34:13.000000000 +0200 -@@ -1,6 +1,6 @@ - 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 --git a/package/nss/Makefile b/package/nss/Makefile index 04096ed78..77caa379f 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -28,8 +28,8 @@ $(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D CONFIG_STYLE:= manual -ifeq ($(ADK_LINUX_64),y) -TARGET_CFLAGS+= -DUSE_64 +ifneq ($(ADK_LINUX_64),) +TARGET_CFLAGS+= -DUSE_64 -DNS_PTR_LE_32 XAKE_FLAGS+= USE_64=1 endif -- cgit v1.2.3