[arch-commits] Commit in lib32-krb5/repos/multilib-x86_64 (5 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Thu Apr 18 16:58:16 UTC 2013
Date: Thursday, April 18, 2013 @ 18:58:15
Author: lcarlier
Revision: 88499
archrelease: copy trunk to multilib-x86_64
Added:
lib32-krb5/repos/multilib-x86_64/PKGBUILD
(from rev 88498, lib32-krb5/trunk/PKGBUILD)
lib32-krb5/repos/multilib-x86_64/krb5-1.10.1-gcc47.patch
(from rev 88498, lib32-krb5/trunk/krb5-1.10.1-gcc47.patch)
lib32-krb5/repos/multilib-x86_64/krb5-config_LDFLAGS.patch
(from rev 88498, lib32-krb5/trunk/krb5-config_LDFLAGS.patch)
Deleted:
lib32-krb5/repos/multilib-x86_64/PKGBUILD
lib32-krb5/repos/multilib-x86_64/krb5-1.10.1-gcc47.patch
---------------------------+
PKGBUILD | 131 ++++++++++++++++++++++----------------------
krb5-1.10.1-gcc47.patch | 22 +++----
krb5-config_LDFLAGS.patch | 12 ++++
3 files changed, 91 insertions(+), 74 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-18 16:58:08 UTC (rev 88498)
+++ PKGBUILD 2013-04-18 16:58:15 UTC (rev 88499)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <flo at xinu.at>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-
-_pkgbasename=krb5
-pkgname=lib32-$_pkgbasename
-pkgver=1.11.1
-pkgrel=1
-pkgdesc="The Kerberos network authentication system (32-bit)"
-arch=('x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('lib32-e2fsprogs' 'lib32-libldap' 'lib32-keyutils' "$_pkgbasename")
-makedepends=('perl' 'gcc-multilib')
-source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.11/${_pkgbasename}-${pkgver}-signed.tar")
-sha1sums=('e2e759c35e775d8f03b75c26ffcaa4f2514147f5')
-options=('!emptydirs')
-
-build() {
- tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
- cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
-
- rm lib/krb5/krb/deltat.c
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
- export CPPFLAGS+=" -I/usr/include/et"
- ./configure --prefix=/usr \
- --sysconfdir=/etc/krb5 \
- --mandir=/usr/share/man \
- --localstatedir=/var/lib \
- --libdir=/usr/lib32 \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --disable-rpath \
- --without-tcl \
- --enable-dns-for-realm \
- --with-ldap \
- --without-system-verto
-
- make
-}
-
-#check() {
- # We can't do this in the build directory.
-
- # only works if the hostname is set properly/resolves to something. whatever...
- #cd "${srcdir}/${_pkgbasename}-${pkgver}"
- #make -C src check
-#}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
Copied: lib32-krb5/repos/multilib-x86_64/PKGBUILD (from rev 88498, lib32-krb5/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-04-18 16:58:15 UTC (rev 88499)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Florian Pritz <flo at xinu.at>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+_pkgbasename=krb5
+pkgname=lib32-$_pkgbasename
+pkgver=1.11.2
+pkgrel=1
+pkgdesc="The Kerberos network authentication system (32-bit)"
+arch=('x86_64')
+url="http://web.mit.edu/kerberos/"
+license=('custom')
+depends=('lib32-e2fsprogs' 'lib32-libldap' 'lib32-keyutils' "$_pkgbasename")
+makedepends=('perl' 'gcc-multilib')
+source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.11/${_pkgbasename}-${pkgver}-signed.tar"
+ krb5-config_LDFLAGS.patch)
+sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250'
+ '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa')
+options=('!emptydirs')
+
+build() {
+ tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
+ cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
+
+ # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
+ patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch
+
+ rm lib/krb5/krb/deltat.c
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
+ export CPPFLAGS+=" -I/usr/include/et"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/lib \
+ --libdir=/usr/lib32 \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --disable-rpath \
+ --without-tcl \
+ --enable-dns-for-realm \
+ --with-ldap \
+ --without-system-verto
+
+ make
+}
+
+#check() {
+ # We can't do this in the build directory.
+
+ # only works if the hostname is set properly/resolves to something. whatever...
+ #cd "${srcdir}/${_pkgbasename}-${pkgver}"
+ #make -C src check
+#}
+
+package() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
+ make DESTDIR="${pkgdir}" install
+
+ rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: krb5-1.10.1-gcc47.patch
===================================================================
--- krb5-1.10.1-gcc47.patch 2013-04-18 16:58:08 UTC (rev 88498)
+++ krb5-1.10.1-gcc47.patch 2013-04-18 16:58:15 UTC (rev 88499)
@@ -1,11 +0,0 @@
-diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400
-+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400
-@@ -44,6 +44,7 @@
- #ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
-
- #include <ctype.h>
Copied: lib32-krb5/repos/multilib-x86_64/krb5-1.10.1-gcc47.patch (from rev 88498, lib32-krb5/trunk/krb5-1.10.1-gcc47.patch)
===================================================================
--- krb5-1.10.1-gcc47.patch (rev 0)
+++ krb5-1.10.1-gcc47.patch 2013-04-18 16:58:15 UTC (rev 88499)
@@ -0,0 +1,11 @@
+diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
+--- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400
++++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400
+@@ -44,6 +44,7 @@
+ #ifdef __GNUC__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wuninitialized"
++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+
+ #include <ctype.h>
Copied: lib32-krb5/repos/multilib-x86_64/krb5-config_LDFLAGS.patch (from rev 88498, lib32-krb5/trunk/krb5-config_LDFLAGS.patch)
===================================================================
--- krb5-config_LDFLAGS.patch (rev 0)
+++ krb5-config_LDFLAGS.patch 2013-04-18 16:58:15 UTC (rev 88499)
@@ -0,0 +1,12 @@
+Bug #448778
+--- krb5-1.11/src/krb5-config.in 2012-12-18 02:47:04.000000000 +0000
++++ krb5-1.11/src/krb5-config.in 2012-12-28 07:13:16.582693363 +0000
+@@ -217,7 +217,7 @@
+ -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
++ -e 's#\$(LDFLAGS)##' \
+ -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ -e 's#\$(CFLAGS)##'`
+
More information about the arch-commits
mailing list