Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1448774aa593fbe6064d7af390c14ee5dc647689
commit 1448774aa593fbe6064d7af390c14ee5dc647689 Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Jul 19 22:57:45 2011 +0200 firefox-5.0.1-1-ppc *fix ppc build diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index c1a0c49..90b61fc 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -17,35 +17,14 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest/source | sed 's/.source//g' | Flasttarbz2" source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 \ 0583d58b20a3.patch \ + ppc_ipc.diff \ ffremote \ $pkgname.desktop \ ${pkgname}-safe-mode.desktop) -signatures=("${source[0]}.asc" '' '' '' '') +signatures=("${source[0]}.asc" '' '' '' '' '') options=('scriptlet') -[ "$CARCH" == "ppc" ] && Fconfopts="${Fconfopts[@]} --disable-ipc" - -build() { - unset MAKEFLAGS - Fcd mozilla-release - - # Autodetect language. - sed -i '/intl.locale.matchOS/s/false/true/' modules/libpref/src/init/all.js || Fdie - - ## broken sqlite3 pc file - Fsed 'SQLITE_VERSION=3.5.9' 'SQLITE_VERSION=3.5' configure - - # fix nspr as well - Fsed '"nspr/' '"nspr4/' ipc/chromium/src/base/basictypes.h - - export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - -# Fsed '\-0' '\-9' config/make-jars.pl - - Fbuild \ - --with-default-mozilla-five-home=/usr \ - --enable-optimize="-O2" \ +Fconfopts="${Fconfopts[@]} --with-default-mozilla-five-home=/usr \ --with-system-nspr \ --with-system-nss \ --with-system-jpeg \ @@ -83,7 +62,27 @@ build() { --disable-calendar \ --disable-composer \ --disable-profilesharing \ - --disable-crashreporter + --disable-crashreporter" + +build() { + unset MAKEFLAGS + Fcd mozilla-release + + # Autodetect language. + sed -i '/intl.locale.matchOS/s/false/true/' modules/libpref/src/init/all.js || Fdie + + ## broken sqlite3 pc file + Fsed 'SQLITE_VERSION=3.5.9' 'SQLITE_VERSION=3.5' configure + + # fix nspr as well + Fsed '"nspr/' '"nspr4/' ipc/chromium/src/base/basictypes.h + + export MOZILLA_OFFICIAL=1 + export BUILD_OFFICIAL=1 + +# Fsed '\-0' '\-9' config/make-jars.pl + + Fbuild --enable-optimize="-O2" # Get rid of versions in path names. Fmv /usr/include/$pkgname-$pathver /usr/include/$pkgname diff --git a/source/xapps/firefox/ppc_ipc.diff b/source/xapps/firefox/ppc_ipc.diff new file mode 100644 index 0000000..1f33677 --- /dev/null +++ b/source/xapps/firefox/ppc_ipc.diff @@ -0,0 +1,44 @@ +diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in +--- a/ipc/chromium/Makefile.in ++++ b/ipc/chromium/Makefile.in +@@ -242,17 +242,16 @@ CPPSRCS += \ + + endif # } OS_MACOSX + + ifdef OS_LINUX # { + + CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ + base_paths_linux.cc \ +- data_pack.cc \ + file_util_linux.cc \ + file_version_info_linux.cc \ + idle_timer_none.cc \ + process_util_linux.cc \ + time_posix.cc \ + $(NULL) + + ifdef MOZ_ENABLE_GTK2 +diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h +--- a/ipc/chromium/src/build/build_config.h ++++ b/ipc/chromium/src/build/build_config.h +@@ -52,17 +52,17 @@ + #define ARCH_CPU_X86_FAMILY 1 + #define ARCH_CPU_X86 1 + #define ARCH_CPU_32_BITS 1 + #elif defined(__ARMEL__) + #define ARCH_CPU_ARM_FAMILY 1 + #define ARCH_CPU_ARMEL 1 + #define ARCH_CPU_32_BITS 1 + #define WCHAR_T_IS_UNSIGNED 1 +-#elif defined(__ppc__) ++#elif defined(__ppc__) || defined(__powerpc__) + #define ARCH_CPU_PPC 1 + #define ARCH_CPU_32_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h + #endif + + // Type detection for wchar_t. + #ifndef CHROMIUM_MOZILLA_BUILD + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git