diff options
Diffstat (limited to 'libre/icecat/PKGBUILD')
| -rw-r--r-- | libre/icecat/PKGBUILD | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 05507bbaa..e45da8749 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -83,8 +83,11 @@ build() { #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" #patch -Np1 -i "$srcdir/firefox-version.patch" +<<<<<<< HEAD [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig +======= +>>>>>>> libre/master # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in |