[arch-commits] Commit in glib/trunk (PKGBUILD glib1-autotools.patch)
Eric Bélanger
eric at nymeria.archlinux.org
Mon Jul 22 06:31:01 UTC 2013
Date: Monday, July 22, 2013 @ 08:31:01
Author: eric
Revision: 191241
upgpkg: glib 1.2.10-10
Fix build issue (close FS#36225), Add prepare and check functions, Disable SMP build
Added:
glib/trunk/glib1-autotools.patch
Modified:
glib/trunk/PKGBUILD
-----------------------+
PKGBUILD | 41 +++++++++++++++++++++++++++--------------
glib1-autotools.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-22 03:45:27 UTC (rev 191240)
+++ PKGBUILD 2013-07-22 06:31:01 UTC (rev 191241)
@@ -3,35 +3,48 @@
pkgname=glib
pkgver=1.2.10
-pkgrel=9
+pkgrel=10
pkgdesc="Common C routines used by Gtk+ and other libs"
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
license=('LGPL')
-depends=('glibc')
-options=('!libtool')
+depends=('glibc' 'sh')
+options=('!libtool' '!makeflags')
install=glib.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
- gcc340.patch aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9'
- '877b3330e822a4be69a0f8a8c268cfd7'
- 'e52c4b88427b9785bb8049dbdc9ff6fb')
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz
+ gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
- 'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
+ 'ae4438cf56c0c9264ee36f6973fb445f9a820be0'
+ '8a25fde3c79567262b3024f4e74c9ca4ee8a6279')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i "${srcdir}/gcc340.patch"
+ patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+ patch -Np1 -i "${srcdir}/glib1-autotools.patch"
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../gcc340.patch
- patch -Np0 -i ../aclocal-fixes.patch
+ cd ${pkgname}-${pkgver}
+ if [[ $CARCH = "i686" ]]; then
+ CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
+ elif [[ $CARCH = "x86_64" ]]; then
+ CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+ fi
- [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+ autoreconf --force --install
./configure --prefix=/usr --mandir=/usr/share/man \
--infodir=/usr/share/info $CONFIGFLAG
make
}
+check() {
+ cd ${pkgname}-${pkgver}
+ make check
+}
+
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
Added: glib1-autotools.patch
===================================================================
--- glib1-autotools.patch (rev 0)
+++ glib1-autotools.patch 2013-07-22 06:31:01 UTC (rev 191241)
@@ -0,0 +1,33 @@
+diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in
+--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400
++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400
+@@ -17,7 +17,7 @@
+
+ dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ #
+ # The following version number definitions apply to GLib, GModule and GThread
+ # as a whole, so if changes occoured in any of them, they are all
+@@ -81,7 +81,7 @@
+
+ dnl figure debugging default, prior to $ac_help setup
+ dnl
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
+ debug_default=yes
+ else
+diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am
+--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400
++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400
+@@ -42,7 +42,7 @@
+ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+
+ noinst_PROGRAMS = testgmodule
+-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
+ testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+
+ .PHONY: files release
More information about the arch-commits
mailing list