summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-13 09:30:32 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-13 09:30:32 +0200
commitb2b3a3e5241f31d00189615d3a86d5e0efd2ca25 (patch)
tree38cbc9ae8f219a9a921732d6132b50ba57ba7dab /core
parenta4a706ff05afab9bb61870c0049aedb23072cec1 (diff)
parent8f0418e4a239ba973834592537b474d3aac52d5b (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/fcitx-mozc/PKGBUILD core/libcap/PKGBUILD extra/ncmpc/PKGBUILD extra/php/PKGBUILD extra/sqlite/PKGBUILD libre/hplip-libre/PKGBUILD libre/icecat/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r--core/binutils/PKGBUILD16
-rw-r--r--core/libcap/PKGBUILD10
2 files changed, 15 insertions, 11 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index a61b3c663..655c19c7e 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 181165 2013-04-02 06:48:55Z allan $
+# $Id: PKGBUILD 182643 2013-04-12 00:05:23Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
pkgver=2.23.2
-pkgrel=1
+pkgrel=2
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/binutils/"
@@ -21,15 +21,21 @@ md5sums=('4f8fa651e35ef262edc01d60fb45702e'
'dfde4428f08d91f309cdcfe92bf28d08'
'34e439ce23213a91e2af872dfbb5094c')
-build() {
+prepare() {
cd ${srcdir}/binutils-${pkgver}
# http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
# http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
- cd ${srcdir}
- mkdir binutils-build && cd binutils-build
+ # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+
+ mkdir ${srcdir}/binutils-build
+}
+
+build() {
+ cd ${srcdir}/binutils-build
${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
--with-lib-path=/usr/lib:/usr/local/lib \
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index 191430f20..1066620dd 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -1,15 +1,16 @@
-#$Id: PKGBUILD 158556 2012-05-04 23:56:45Z allan $
+#$Id: PKGBUILD 182644 2013-04-12 00:05:24Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libcap
pkgver=2.22
-pkgrel=3
+pkgrel=4
pkgdesc="POSIX 1003.1e capabilities"
arch=('i686' 'x86_64' 'mips64el')
url="http://sites.google.com/site/fullycapable/"
license=('GPL2')
depends=('glibc' 'attr')
+options=('!staticlibs')
source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
md5sums=('b4896816b626bea445f0b3849bdd4077'
'9d0983e25e5a251d098507f9561d2b27')
@@ -21,10 +22,7 @@ build() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=/usr lib=lib DESTDIR=${pkgdir} RAISE_SETFCAP=no install
-
- chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver}
- rm ${pkgdir}/usr/lib/libcap.a
+ make prefix=/usr lib=/lib DESTDIR=${pkgdir} RAISE_SETFCAP=no install
install -Dm644 pam_cap/capability.conf \
$pkgdir/usr/share/doc/$pkgname/capability.conf.example