diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-06 11:01:36 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-06 11:01:36 -0300 |
commit | 090589ce217a61645ebcef0f1f3d52c543e47364 (patch) | |
tree | 792eace90f1a5f1da8c0a1a8cb4a2a5aad12f55b | |
parent | bc0ccec3685ede2cb56b17c08df6917637c6f60f (diff) |
xulrunner + missing patches
-rw-r--r-- | core/gcc/gcc_mips64el_lib.patch | 25 | ||||
-rw-r--r-- | core/pacman/pacman.conf.mips64el | 86 | ||||
-rw-r--r-- | extra/xulrunner/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/xulrunner/mips.patch | 114 | ||||
-rw-r--r-- | extra/xulrunner/xulrunner-omnijar.patch | 33 |
5 files changed, 243 insertions, 29 deletions
diff --git a/core/gcc/gcc_mips64el_lib.patch b/core/gcc/gcc_mips64el_lib.patch new file mode 100644 index 000000000..425758e88 --- /dev/null +++ b/core/gcc/gcc_mips64el_lib.patch @@ -0,0 +1,25 @@ +--- gcc/config/mips/t-linux64.orig 2011-04-09 20:28:51.729723495 -0300 ++++ gcc/config/mips/t-linux64 2011-04-09 20:29:06.913724013 -0300 +@@ -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 ../lib32 ../lib64 + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + +--- gcc/config/mips/linux64.h.orig 2011-04-09 20:27:06.909723735 -0300 ++++ gcc/config/mips/linux64.h 2011-04-09 20:28:16.033723803 -0300 +@@ -35,9 +35,9 @@ + %{!shared: \ + %{profile:-lc_p} %{!profile:-lc}}" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) diff --git a/core/pacman/pacman.conf.mips64el b/core/pacman/pacman.conf.mips64el new file mode 100644 index 000000000..09a5c8d5a --- /dev/null +++ b/core/pacman/pacman.conf.mips64el @@ -0,0 +1,86 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = mips64el + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 1d353f6b3..e4f0c9fb0 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -18,13 +18,6 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz xulrunner-omnijar.patch port_gnomevfs_to_gio.patch mips.patch) -md5sums=('1b4d44ee5badc28fd332cba564ecde0a' - '2358a2ddd35bcdd62ff42442dfe548d9' - '639ea80e823543dd415b90c0ee804186' - 'a0236f6c3e55f60b7888d8cf137ff209' - '0bf82bc6677e3ce57fd20a147fe8d7b1' - '42f83468b296452fb754a81a4317ca64' - '0e970ff5600246e953f527813883e744') options=('!emptydirs') build() { @@ -69,3 +62,10 @@ package() { install -d ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf } +md5sums=('1b4d44ee5badc28fd332cba564ecde0a' + '2358a2ddd35bcdd62ff42442dfe548d9' + '639ea80e823543dd415b90c0ee804186' + 'a0236f6c3e55f60b7888d8cf137ff209' + 'f8b64cf798636a9c1e4e10c08de0b859' + '42f83468b296452fb754a81a4317ca64' + '0e970ff5600246e953f527813883e744') diff --git a/extra/xulrunner/mips.patch b/extra/xulrunner/mips.patch new file mode 100644 index 000000000..f9de910b2 --- /dev/null +++ b/extra/xulrunner/mips.patch @@ -0,0 +1,114 @@ +--- ../../tmp.ne6Bz1oy72/xulrunner/src/mozilla-2.0/js/src/assembler/jit/ExecutableAllocator.h 2011-03-18 20:33:47.000000000 -0300 ++++ js/src/assembler/jit/ExecutableAllocator.h 2011-03-30 15:45:07.537247142 -0300 +@@ -44,9 +44,7 @@ + #include <e32std.h> + #endif + +-#if WTF_CPU_MIPS && WTF_PLATFORM_LINUX + #include <sys/cachectl.h> +-#endif + + #if WTF_PLATFORM_WINCE + // From pkfuncs.h (private header file from the Platform Builder) +@@ -311,89 +309,10 @@ + #endif + + +-#if WTF_CPU_X86 || WTF_CPU_X86_64 +- static void cacheFlush(void*, size_t) +- { +- } +-#elif WTF_CPU_MIPS + static void cacheFlush(void* code, size_t size) + { +-#if WTF_COMPILER_GCC && (GCC_VERSION >= 40300) +-#if WTF_MIPS_ISA_REV(2) && (GCC_VERSION < 40403) +- int lineSize; +- asm("rdhwr %0, $1" : "=r" (lineSize)); +- // +- // Modify "start" and "end" to avoid GCC 4.3.0-4.4.2 bug in +- // mips_expand_synci_loop that may execute synci one more time. +- // "start" points to the fisrt byte of the cache line. +- // "end" points to the last byte of the line before the last cache line. +- // Because size is always a multiple of 4, this is safe to set +- // "end" to the last byte. +- // +- intptr_t start = reinterpret_cast<intptr_t>(code) & (-lineSize); +- intptr_t end = ((reinterpret_cast<intptr_t>(code) + size - 1) & (-lineSize)) - 1; +- __builtin___clear_cache(reinterpret_cast<char*>(start), reinterpret_cast<char*>(end)); +-#else +- intptr_t end = reinterpret_cast<intptr_t>(code) + size; +- __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end)); +-#endif +-#else + _flush_cache(reinterpret_cast<char*>(code), size, BCACHE); +-#endif +- } +-#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_IPHONE +- static void cacheFlush(void* code, size_t size) +- { +- sys_dcache_flush(code, size); +- sys_icache_invalidate(code, size); +- } +-#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_LINUX +- static void cacheFlush(void* code, size_t size) +- { +- asm volatile ( +- "push {r7}\n" +- "mov r0, %0\n" +- "mov r1, %1\n" +- "movw r7, #0x2\n" +- "movt r7, #0xf\n" +- "movs r2, #0x0\n" +- "svc 0x0\n" +- "pop {r7}\n" +- : +- : "r" (code), "r" (reinterpret_cast<char*>(code) + size) +- : "r0", "r1", "r2"); +- } +-#elif WTF_PLATFORM_SYMBIAN +- static void cacheFlush(void* code, size_t size) +- { +- User::IMB_Range(code, static_cast<char*>(code) + size); +- } +-#elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_LINUX && WTF_COMPILER_RVCT +- static __asm void cacheFlush(void* code, size_t size); +-#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID) && WTF_COMPILER_GCC +- static void cacheFlush(void* code, size_t size) +- { +- asm volatile ( +- "push {r7}\n" +- "mov r0, %0\n" +- "mov r1, %1\n" +- "mov r7, #0xf0000\n" +- "add r7, r7, #0x2\n" +- "mov r2, #0x0\n" +- "svc 0x0\n" +- "pop {r7}\n" +- : +- : "r" (code), "r" (reinterpret_cast<char*>(code) + size) +- : "r0", "r1", "r2"); +- } +-#elif WTF_PLATFORM_WINCE +- static void cacheFlush(void* code, size_t size) +- { +- CacheRangeFlush(code, size, CACHE_SYNC_ALL); + } +-#else +- #error "The cacheFlush support is missing on this platform." +-#endif + + private: + +--- js/src/Makefile.in.orig 2011-03-30 22:02:39.725318514 -0300 ++++ js/src/Makefile.in 2011-03-30 22:02:51.689347820 -0300 +@@ -914,7 +914,7 @@ + # Needed to "configure" it correctly. Unfortunately these + # flags wind up being applied to all code in js/src, not just + # the code in js/src/assembler. +-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 ++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_JIT=1 + + INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr + + diff --git a/extra/xulrunner/xulrunner-omnijar.patch b/extra/xulrunner/xulrunner-omnijar.patch index 66ec5206c..2cfab6b33 100644 --- a/extra/xulrunner/xulrunner-omnijar.patch +++ b/extra/xulrunner/xulrunner-omnijar.patch @@ -93,28 +93,6 @@ diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/re # Parent 3038cccba1a071d6b418e15442d0f2d9f3dcb11d Bug 620931 part 2 - When building --with-libxul-sdk, use the right preferences directory -diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in ---- a/browser/locales/Makefile.in -+++ b/browser/locales/Makefile.in -@@ -183,17 +183,17 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins - - - libs-%: - $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 -- @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 -+ @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - - - repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" - repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) - @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." - $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export - $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -1735,3 +1713,14 @@ diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh fi MOZ_EXTENSIONS_DEFAULT=" gnomevfs" MOZ_URL_CLASSIFIER=1 +--- a/browser/locales/Makefile.in.orig 2011-06-02 14:05:23.166534416 -0300 ++++ b/browser/locales/Makefile.in 2011-06-02 14:05:35.948920125 -0300 +@@ -194,7 +194,7 @@ libs-%: + @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 + @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +- @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 ++ @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 + ifdef MOZ_BRANDING_DIRECTORY + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + endif |