diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/icecat/PKGBUILD | 3 | ||||
| -rw-r--r-- | libre/kernel26-libre/Kbuild | 19 | ||||
| -rw-r--r-- | libre/kernel26-libre/Kbuild.platforms | 6 | ||||
| -rw-r--r-- | libre/pacman/PKGBUILD | 17 |
4 files changed, 0 insertions, 45 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e45da8749..05507bbaa 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -83,11 +83,8 @@ 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 diff --git a/libre/kernel26-libre/Kbuild b/libre/kernel26-libre/Kbuild deleted file mode 100644 index 8a9d7dceb..000000000 --- a/libre/kernel26-libre/Kbuild +++ /dev/null @@ -1,19 +0,0 @@ -# Fail on warnings - also for files referenced in subdirs -# -Werror can be disabled for specific files using: -# CFLAGS_<file.o> := -Wno-error -subdir-ccflags-y := -Wno-error - -# platform specific definitions -include arch/mips/Kbuild.platforms -obj-y := $(platform-y) - -# make clean traverses $(obj-) without having included .config, so -# everything ends up here -obj- := $(platform-) - -# mips object files -# The object files are linked as core-y files would be linked - -obj-y += kernel/ -obj-y += mm/ -obj-y += math-emu/ diff --git a/libre/kernel26-libre/Kbuild.platforms b/libre/kernel26-libre/Kbuild.platforms deleted file mode 100644 index 90a226888..000000000 --- a/libre/kernel26-libre/Kbuild.platforms +++ /dev/null @@ -1,6 +0,0 @@ -# All platforms listed in alphabetic order - -platforms += loongson - -# include the platform specific files -include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms)) diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index dd0ff5fda..e6f53188a 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -3,11 +3,7 @@ pkgname=pacman pkgver=3.5.4 -<<<<<<< HEAD pkgrel=4.2 -======= -pkgrel=4 ->>>>>>> libre/master pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -25,15 +21,12 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.mips64el makepkg.conf 0001-makepkg-fix-removing-symbolic-link.patch) -<<<<<<< HEAD -======= md5sums=('2dd3a85d55ee3dd89abd349aa837447c' 'ba85525fe868f030bef209b0487dd5a5' '7aaccf24479f396d4a5987c8ccd2f3a2' '150a2854816cd67b1608e00f99701c1c' 'be10d3d2e533515a0470237761415568' '749a4ddc6d8418d8d031f1c9b4e09d6f') ->>>>>>> libre/master # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -74,11 +67,7 @@ package() { mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" -<<<<<<< HEAD myldflags="-Wl,--as-needed" -======= - myldflags="" ->>>>>>> libre/master ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ @@ -97,9 +86,3 @@ package() { } # vim: set ts=2 sw=2 et: -md5sums=('2dd3a85d55ee3dd89abd349aa837447c' - 'ba85525fe868f030bef209b0487dd5a5' - '7aaccf24479f396d4a5987c8ccd2f3a2' - '150a2854816cd67b1608e00f99701c1c' - 'be10d3d2e533515a0470237761415568' - '749a4ddc6d8418d8d031f1c9b4e09d6f') |