[arch-commits] Commit in (12 files)
Eli Schwartz
eschwartz at archlinux.org
Fri Sep 20 17:34:42 UTC 2019
Date: Friday, September 20, 2019 @ 17:34:42
Author: eschwartz
Revision: 511240
Clean up the use of gcc-multilib as makedepends
lib32-gcc-libs is in multilib-devel which is what is needed, now that core/gcc
has native -m32 support.
Also clean up misc issues e.g. unquoted srcdir/pkgdir encountered along the way
Modified:
lib32-simplescreenrecorder/trunk/PKGBUILD
lib32-sqlite/trunk/PKGBUILD
lib32-systemd/trunk/PKGBUILD
lib32-util-linux/trunk/PKGBUILD
lib32-wxgtk2/trunk/PKGBUILD
lib32-xcb-util/trunk/PKGBUILD
lib32-xz/trunk/PKGBUILD
lib32-zlib/trunk/PKGBUILD
nspluginwrapper/trunk/PKGBUILD
smlnj/trunk/PKGBUILD
virtualbox/trunk/PKGBUILD
zsnes/trunk/PKGBUILD
-------------------------------------------+
lib32-simplescreenrecorder/trunk/PKGBUILD | 2 +-
lib32-sqlite/trunk/PKGBUILD | 4 ++--
lib32-systemd/trunk/PKGBUILD | 2 +-
lib32-util-linux/trunk/PKGBUILD | 1 -
lib32-wxgtk2/trunk/PKGBUILD | 2 +-
lib32-xcb-util/trunk/PKGBUILD | 2 +-
lib32-xz/trunk/PKGBUILD | 9 ++++-----
lib32-zlib/trunk/PKGBUILD | 1 -
nspluginwrapper/trunk/PKGBUILD | 1 -
smlnj/trunk/PKGBUILD | 3 +--
virtualbox/trunk/PKGBUILD | 1 -
zsnes/trunk/PKGBUILD | 15 +++++----------
12 files changed, 16 insertions(+), 27 deletions(-)
Modified: lib32-simplescreenrecorder/trunk/PKGBUILD
===================================================================
--- lib32-simplescreenrecorder/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-simplescreenrecorder/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -9,7 +9,7 @@
url="https://www.maartenbaert.be/simplescreenrecorder/"
license=("GPL3")
depends=("lib32-libgl" "lib32-glu" "lib32-libx11" "lib32-libxext" "lib32-libxfixes")
-makedepends=("git" "gcc-multilib" "cmake")
+makedepends=("git" "cmake")
install=lib32-simplescreenrecorder.install
source=("git+https://github.com/MaartenBaert/ssr.git#tag=$pkgver")
md5sums=("SKIP")
Modified: lib32-sqlite/trunk/PKGBUILD
===================================================================
--- lib32-sqlite/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-sqlite/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -12,7 +12,7 @@
license=('custom')
url="https://www.sqlite.org/"
depends=(lib32-glibc $_pkgbasename)
-makedepends=('tcl' 'gcc-multilib' 'lib32-readline')
+makedepends=('tcl' 'lib32-readline')
source=(https://www.sqlite.org/2019/sqlite-src-${_srcver}.zip)
sha1sums=('e8862aa46fb70e25c8006a1fe519067a1fa9e618')
options=('!makeflags')
@@ -51,7 +51,7 @@
package() {
cd "$srcdir"/sqlite-src-$_srcver
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/{include,share,bin}
mkdir -p "$pkgdir/usr/share/licenses"
Modified: lib32-systemd/trunk/PKGBUILD
===================================================================
--- lib32-systemd/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-systemd/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -13,7 +13,7 @@
url='https://www.github.com/systemd/systemd'
license=('GPL2' 'LGPL2.1')
depends=('lib32-gcc-libs' 'lib32-libcap' 'lib32-libgcrypt' 'lib32-xz' 'systemd')
-makedepends=('gcc-multilib' 'git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2'
+makedepends=('git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2'
'lib32-curl' 'lib32-dbus' 'lib32-gcc-libs' 'lib32-glib2'
'lib32-gnutls' 'lib32-libelf' 'lib32-libidn2' 'lib32-pcre2'
'libxslt' 'meson')
Modified: lib32-util-linux/trunk/PKGBUILD
===================================================================
--- lib32-util-linux/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-util-linux/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -11,7 +11,6 @@
arch=('x86_64')
depends=('lib32-glibc' "$_pkgbasename")
provides=('libuuid.so' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so')
-makedepends=('gcc-multilib')
license=('GPL2')
options=('!emptydirs')
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
Modified: lib32-wxgtk2/trunk/PKGBUILD
===================================================================
--- lib32-wxgtk2/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-wxgtk2/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -9,7 +9,7 @@
url='https://wxwidgets.org'
license=('custom:wxWindows')
depends=('lib32-gtk2' 'lib32-libsm' 'wxgtk2')
-makedepends=('gcc-multilib' 'lib32-glu')
+makedepends=('lib32-glu')
conflicts=('lib32-wxgtk')
provides=('lib32-wxgtk')
replaces=('lib32-wxgtk')
Modified: lib32-xcb-util/trunk/PKGBUILD
===================================================================
--- lib32-xcb-util/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-xcb-util/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -9,7 +9,7 @@
url="https://xcb.freedesktop.org"
license=('custom')
depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename)
-makedepends=('gperf' 'gcc-multilib')
+makedepends=('gperf')
source=(https://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2)
sha512sums=('e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e')
Modified: lib32-xz/trunk/PKGBUILD
===================================================================
--- lib32-xz/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-xz/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -10,7 +10,6 @@
url='https://tukaani.org/xz/'
license=('GPL' 'LGPL' 'custom')
depends=('lib32-glibc' 'xz')
-makedepends=('gcc-multilib')
source=("https://tukaani.org/xz/${_pkgbasename}-${pkgver}.tar.gz"{,.sig})
sha256sums=('b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145'
'SKIP')
@@ -17,7 +16,7 @@
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin
build() {
- cd ${srcdir}/xz-${pkgver}
+ cd "${srcdir}"/xz-${pkgver}
export CC="gcc -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
@@ -30,15 +29,15 @@
}
check() {
- cd ${srcdir}/xz-${pkgver}
+ cd "${srcdir}"/xz-${pkgver}
make check
}
package() {
- cd ${srcdir}/xz-${pkgver}
+ cd "${srcdir}"/xz-${pkgver}
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/{bin,include,share}
install -d -m755 "${pkgdir}"/usr/share/licenses
Modified: lib32-zlib/trunk/PKGBUILD
===================================================================
--- lib32-zlib/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ lib32-zlib/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -10,7 +10,6 @@
license=('custom')
url="https://www.zlib.net/"
depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
md5sums=('1c9f62f0778697a09d36121ead88e08e'
'SKIP')
Modified: nspluginwrapper/trunk/PKGBUILD
===================================================================
--- nspluginwrapper/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ nspluginwrapper/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -8,7 +8,6 @@
license=('GPL')
depends=('curl' 'libxt' 'gcc-libs' 'gtk2')
depends_x86_64=('lib32-libxt' 'lib32-gcc-libs' 'lib32-gtk2')
-makedepends_x86_64=('gcc-multilib')
install="install"
#source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
source=("https://github.com/davidben/nspluginwrapper/archive/nspluginwrapper-$pkgver.tar.gz"
Modified: smlnj/trunk/PKGBUILD
===================================================================
--- smlnj/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ smlnj/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -10,8 +10,7 @@
arch=(x86_64)
provides=(sml)
install=smlnj.install
-depends=(lib32-glibc)
-makedepends=(gcc-multilib)
+depends_x86_64=(lib32-glibc)
_url="http://smlnj.cs.uchicago.edu/dist/working/$pkgver/"
source=(
"$pkgname-$pkgver-boot.x86-unix.tgz::${_url}boot.x86-unix.tgz"
Modified: virtualbox/trunk/PKGBUILD
===================================================================
--- virtualbox/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ virtualbox/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -52,7 +52,6 @@
'xalan-c'
'xf86driproto'
'xorg-server-devel')
-makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
# We need to build a modified version of vboxsf for Linux 4.16
# https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
Modified: zsnes/trunk/PKGBUILD
===================================================================
--- zsnes/trunk/PKGBUILD 2019-09-20 17:12:08 UTC (rev 511239)
+++ zsnes/trunk/PKGBUILD 2019-09-20 17:34:42 UTC (rev 511240)
@@ -15,12 +15,7 @@
makedepends=('nasm' 'gendesk' 'mesa')
depends_x86_64=('lib32-gcc-libs' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses')
optdepends_x86_64=('lib32-alsa-lib: sound support')
-makedepends_x86_64=('gcc-multilib')
-depends_i686=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses')
-optdepends_i686=('alsa-lib: sound support')
-makedepends_i686=('nasm' 'gcc' 'gendesk' 'mesa')
-
source=(https://downloads.sourceforge.net/project/zsnes/zsnes/ZSNES%20v1.51/zsnes151src.tar.bz2
zsnes.patch
zsnes-1.51-libpng15.patch
@@ -61,15 +56,15 @@
cd "${pkgname}_1_51/src"
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
# adding --mandir= to autoconf line fails
- install -dm755 ${pkgdir}/usr/share
+ install -dm755 "${pkgdir}/usr/share"
- install -Dm644 ${srcdir}/zsnes.desktop ${pkgdir}/usr/share/applications/zsnes.desktop
- install -Dm644 ${srcdir}/zsnes.png ${pkgdir}/usr/share/pixmaps/zsnes.png
+ install -Dm644 "${srcdir}/zsnes.desktop" "${pkgdir}/usr/share/applications/zsnes.desktop"
+ install -Dm644 "${srcdir}/zsnes.png" "${pkgdir}/usr/share/pixmaps/zsnes.png"
- mv ${pkgdir}/usr/man ${pkgdir}/usr/share
+ mv "${pkgdir}/usr/man" "${pkgdir}/usr/share"
}
# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list