[arch-commits] Commit in lib32-librsvg/repos/multilib-x86_64 (4 files)
Jan Steffens
heftig at archlinux.org
Thu Mar 29 22:27:23 UTC 2018
Date: Thursday, March 29, 2018 @ 22:27:22
Author: heftig
Revision: 313478
archrelease: copy trunk to multilib-x86_64
Added:
lib32-librsvg/repos/multilib-x86_64/PKGBUILD
(from rev 313477, lib32-librsvg/trunk/PKGBUILD)
lib32-librsvg/repos/multilib-x86_64/multilib.diff
(from rev 313477, lib32-librsvg/trunk/multilib.diff)
Deleted:
lib32-librsvg/repos/multilib-x86_64/PKGBUILD
lib32-librsvg/repos/multilib-x86_64/multilib.diff
---------------+
PKGBUILD | 117 +++++++++++++++++++++++++++-----------------------------
multilib.diff | 94 ++++++++++++++++++++++----------------------
2 files changed, 104 insertions(+), 107 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-29 22:26:48 UTC (rev 313477)
+++ PKGBUILD 2018-03-29 22:27:22 UTC (rev 313478)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: jtts <jussaar at mbnet.fi>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=lib32-librsvg
-pkgver=2.42.3
-pkgrel=1
-pkgdesc="SVG rendering library (32-bit)"
-url="https://wiki.gnome.org/Projects/LibRsvg"
-arch=(x86_64)
-license=(LGPL)
-depends=(lib32-gdk-pixbuf2 lib32-pango lib32-libcroco librsvg)
-makedepends=(intltool gobject-introspection vala python2 gtk-doc git rustup)
-_commit=ca640d1185745665c61689b71c627e1d020a80b7 # tags/2.42.3^0
-source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"
- multilib.diff)
-sha256sums=('SKIP'
- '1f61c67a7527dbf95d47e3782b0824b6ea5c0ce27bcd8b86de07b616a9b0a33e')
-
-pkgver() {
- cd librsvg
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- rustup default stable
- rustup target add i686-unknown-linux-gnu
-
- cd librsvg
-
- # Hack to cross-compile rust only
- patch -Np1 -i ../multilib.diff
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
- cd librsvg
- ./configure --prefix=/usr --disable-static --enable-vala --disable-gtk-doc --libdir=/usr/lib32
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
- make
-}
-
-check() {
- cd librsvg
- make check
-}
-
-package() {
- cd librsvg
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir"/usr/{bin,include,share}
-}
-
-# vim: ts=2 sw=2 et:
Copied: lib32-librsvg/repos/multilib-x86_64/PKGBUILD (from rev 313477, lib32-librsvg/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-29 22:27:22 UTC (rev 313478)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: jtts <jussaar at mbnet.fi>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=lib32-librsvg
+pkgver=2.42.3
+pkgrel=2
+pkgdesc="SVG rendering library (32-bit)"
+url="https://wiki.gnome.org/Projects/LibRsvg"
+arch=(x86_64)
+license=(LGPL)
+depends=(lib32-gdk-pixbuf2 lib32-pango lib32-libcroco librsvg)
+makedepends=(intltool gobject-introspection vala python2 gtk-doc git lib32-rust)
+_commit=ca640d1185745665c61689b71c627e1d020a80b7 # tags/2.42.3^0
+source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"
+ multilib.diff)
+sha256sums=('SKIP'
+ '1f61c67a7527dbf95d47e3782b0824b6ea5c0ce27bcd8b86de07b616a9b0a33e')
+
+pkgver() {
+ cd librsvg
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd librsvg
+
+ # Hack to cross-compile rust only
+ patch -Np1 -i ../multilib.diff
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+ cd librsvg
+ ./configure --prefix=/usr --disable-static --enable-vala --disable-gtk-doc --libdir=/usr/lib32
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+ make
+}
+
+check() {
+ cd librsvg
+ make check
+}
+
+package() {
+ cd librsvg
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir"/usr/{bin,include,share}
+}
+
+# vim: ts=2 sw=2 et:
Deleted: multilib.diff
===================================================================
--- multilib.diff 2018-03-29 22:26:48 UTC (rev 313477)
+++ multilib.diff 2018-03-29 22:27:22 UTC (rev 313478)
@@ -1,47 +0,0 @@
- Makefile.am | 6 ++----
- configure.ac | 4 +---
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git c/Makefile.am i/Makefile.am
-index a5a16220..10c4bb57 100644
---- c/Makefile.am
-+++ i/Makefile.am
-@@ -114,21 +114,19 @@ else
- CARGO_RELEASE_ARGS=--release
- endif
-
--if CROSS_COMPILING
--CARGO_TARGET_ARGS=--target=$(host)
--endif
-+CARGO_TARGET_ARGS=--target=i686-unknown-linux-gnu
-
- CARGO_VERBOSE = $(cargo_verbose_$(V))
- cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
- cargo_verbose_0 =
- cargo_verbose_1 = --verbose
-
- RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
- CARGO_TARGET_DIR=@abs_top_builddir@/target
-
- check-local:
- cd $(srcdir) && \
-- CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo test
-+ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo test $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
-
- clean-local:
- cd $(top_srcdir) && \
-diff --git c/configure.ac i/configure.ac
-index 2fae2362..9d4004f8 100644
---- c/configure.ac
-+++ i/configure.ac
-@@ -289,9 +289,7 @@ fi
- AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"])
-
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
--if test "x$cross_compiling" = "xyes" ; then
-- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR"
--fi
-+RUST_TARGET_SUBDIR="i686-unknown-linux-gnu/$RUST_TARGET_SUBDIR"
- AC_SUBST([RUST_TARGET_SUBDIR])
-
- dnl ===========================================================================
Copied: lib32-librsvg/repos/multilib-x86_64/multilib.diff (from rev 313477, lib32-librsvg/trunk/multilib.diff)
===================================================================
--- multilib.diff (rev 0)
+++ multilib.diff 2018-03-29 22:27:22 UTC (rev 313478)
@@ -0,0 +1,47 @@
+ Makefile.am | 6 ++----
+ configure.ac | 4 +---
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git c/Makefile.am i/Makefile.am
+index a5a16220..10c4bb57 100644
+--- c/Makefile.am
++++ i/Makefile.am
+@@ -114,21 +114,19 @@ else
+ CARGO_RELEASE_ARGS=--release
+ endif
+
+-if CROSS_COMPILING
+-CARGO_TARGET_ARGS=--target=$(host)
+-endif
++CARGO_TARGET_ARGS=--target=i686-unknown-linux-gnu
+
+ CARGO_VERBOSE = $(cargo_verbose_$(V))
+ cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
+ cargo_verbose_0 =
+ cargo_verbose_1 = --verbose
+
+ RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
+ CARGO_TARGET_DIR=@abs_top_builddir@/target
+
+ check-local:
+ cd $(srcdir) && \
+- CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo test
++ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo test $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
+
+ clean-local:
+ cd $(top_srcdir) && \
+diff --git c/configure.ac i/configure.ac
+index 2fae2362..9d4004f8 100644
+--- c/configure.ac
++++ i/configure.ac
+@@ -289,9 +289,7 @@ fi
+ AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"])
+
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+-if test "x$cross_compiling" = "xyes" ; then
+- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR"
+-fi
++RUST_TARGET_SUBDIR="i686-unknown-linux-gnu/$RUST_TARGET_SUBDIR"
+ AC_SUBST([RUST_TARGET_SUBDIR])
+
+ dnl ===========================================================================
More information about the arch-commits
mailing list