[arch-commits] Commit in xorg-xrdb/trunk (PKGBUILD)
Andreas Radke
andyrtr at archlinux.org
Tue Jan 5 12:28:56 UTC 2016
Date: Tuesday, January 5, 2016 @ 13:28:55
Author: andyrtr
Revision: 257523
upgpkg: xorg-xrdb 1.1.0-2
use either gcc or mcpp for preprocessing making them optional dependencies; FS#46934
Modified:
xorg-xrdb/trunk/PKGBUILD
----------+
PKGBUILD | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-05 12:02:48 UTC (rev 257522)
+++ PKGBUILD 2016-01-05 12:28:55 UTC (rev 257523)
@@ -3,25 +3,29 @@
pkgname=xorg-xrdb
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="X server resource database utility"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('libx11' 'libxmu' 'mcpp')
+depends=('libx11' 'libxmu')
makedepends=('xorg-util-macros')
+optdepends=('gcc: for preprocessing'
+ 'mcpp: a lightweight alternative for preprocessing')
groups=('xorg-apps' 'xorg')
source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2)
sha256sums=('73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b')
build() {
- cd "${srcdir}/xrdb-${pkgver}"
- ./configure --prefix=/usr --with-cpp=/usr/bin/mcpp
+ cd xrdb-${pkgver}
+ # --with-cpp=path comma-separated list of paths to cpp command for xrdb to use at runtime
+ # mcpp is small but can fail, FS#46934
+ ./configure --prefix=/usr --with-cpp=/usr/bin/cpp,/usr/bin/mcpp
make
}
package() {
- cd "${srcdir}/xrdb-${pkgver}"
+ cd xrdb-${pkgver}
make DESTDIR="${pkgdir}" install
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
}
More information about the arch-commits
mailing list