summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-02-14 18:37:45 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-02-14 18:37:45 +0000
commit39625c36749c0f00c2cdb9cd5643dc34c177fd8c (patch)
treeb96e4dd203e10a0e2248533be351f5932ad20071 /gnustep-libs
parentFix missing function pkg_setup definition (diff)
downloadhistorical-39625c36749c0f00c2cdb9cd5643dc34c177fd8c.tar.gz
historical-39625c36749c0f00c2cdb9cd5643dc34c177fd8c.tar.bz2
historical-39625c36749c0f00c2cdb9cd5643dc34c177fd8c.zip
Fix configure with clang
Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64
Diffstat (limited to 'gnustep-libs')
-rw-r--r--gnustep-libs/dbuskit/ChangeLog8
-rw-r--r--gnustep-libs/dbuskit/Manifest13
-rw-r--r--gnustep-libs/dbuskit/dbuskit-0.1.ebuild9
-rw-r--r--gnustep-libs/dbuskit/files/dbuskit-0.1-configure.patch31
4 files changed, 50 insertions, 11 deletions
diff --git a/gnustep-libs/dbuskit/ChangeLog b/gnustep-libs/dbuskit/ChangeLog
index d2e79650c762..2e7f4aa1450d 100644
--- a/gnustep-libs/dbuskit/ChangeLog
+++ b/gnustep-libs/dbuskit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnustep-libs/dbuskit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/dbuskit/ChangeLog,v 1.2 2011/05/02 13:56:31 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/dbuskit/ChangeLog,v 1.3 2012/02/14 18:37:45 voyageur Exp $
+
+ 14 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> dbuskit-0.1.ebuild,
+ +files/dbuskit-0.1-configure.patch:
+ Fix configure with clang
02 May 2011; Bernard Cafarelli <voyageur@gentoo.org> dbuskit-0.1.ebuild:
Also works on ppc
diff --git a/gnustep-libs/dbuskit/Manifest b/gnustep-libs/dbuskit/Manifest
index 6b575a3f6a39..caa8ce495474 100644
--- a/gnustep-libs/dbuskit/Manifest
+++ b/gnustep-libs/dbuskit/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX dbuskit-0.1-configure.patch 764 RMD160 88d78dd7505976e6ba6720150e2a031d621c2599 SHA1 e89939fabe8c59dc8394ca042b747aa76fec67fe SHA256 716d99fe44f6ba3b3e5bab87d57dad3029ee6638df06b3297f7ef26fa21caa04
DIST dbuskit-0.1.tar.bz2 430580 RMD160 f375fabd1919cd40dd8b3391a5df82065204293b SHA1 611851dfd2e58f4f4a658d1a3a8d2d2f70c53d2f SHA256 8a6c7ea00a393f43e8cf0dd2337bc6b58e8f542b42568324f996a2070de3380c
-EBUILD dbuskit-0.1.ebuild 699 RMD160 7e59df3423e79edee849e039942d34415c176b9a SHA1 1f10937927b377640fab1f2452f39331c0c2e593 SHA256 3c9348972370cf1251dd964093027f15eb0e7cdb37dc15c3a10900f2244e6b29
-MISC ChangeLog 450 RMD160 2e586391e0e325a74aa019ce7f86634921700ded SHA1 f114486cffc8ef82ed31cf553115c48927d6cd1e SHA256 525c0dfd925cb4347808f9470bbdc570992a9dcc7a2681ca11ef1a11131b8f59
+EBUILD dbuskit-0.1.ebuild 766 RMD160 0fddea777b3dc6b34b2ade463162dbf42ab2cb16 SHA1 a21f03014664586cb52cf2ac4064006c93ebcb38 SHA256 87bcc5ca9d14a9d4f51eb719dada1ad12b06043d14160515e9d7791bec3e393f
+MISC ChangeLog 591 RMD160 6089fe5e0913a7eaa52f93129131ea1bbe579621 SHA1 5870570096ea945790bc380def6ea9b834546f0e SHA256 932ed0b13ff1bb39e468ddb0fb9b5e1044f3cc5d3c2a7d838f9e10501b085ec1
MISC metadata.xml 523 RMD160 8ff8181cf4410c749661d12861e17ee0f91b803f SHA1 eb159227ccee3c998b92775f83311c50ba88d0e5 SHA256 ab8c43951300ee925127d5cc90e97a0d2b1e46c9c29909ffaa232c23a5ea30d2
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk2+uBoACgkQFYEBGcdFJfKm0QD7B3WYtlJHP+gIgWA3zy+1n5ti
-9Divzx+xbmYJm2MbMCUBAKzz6OewT2Sb8oLSugeVatYA6LaSamwv7FyrcJbrnybJ
-=Dec+
+iF4EAREIAAYFAk86qgcACgkQFYEBGcdFJfK2gAD9F7MBjTrp9DYnhcbC71QiRtnY
+Vv/7Nm+U1nLZND8KeewBAKYcdD9tnAH/fZBBNnbXgEyBQKSvCaDr8qOVjAzLAslA
+=PHp0
-----END PGP SIGNATURE-----
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
index b77dcf78b027..3cdf9ab73d27 100644
--- a/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
+++ b/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/dbuskit/dbuskit-0.1.ebuild,v 1.2 2011/05/02 13:56:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/dbuskit/dbuskit-0.1.ebuild,v 1.3 2012/02/14 18:37:45 voyageur Exp $
EAPI=4
-inherit gnustep-2
+inherit autotools gnustep-2
DESCRIPTION="framework that interfaces Objective-C applications with the D-Bus IPC service"
HOMEPAGE="http://www.gnustep.org"
@@ -18,9 +18,12 @@ DEPEND=">=sys-apps/dbus-1.2.1"
RDEPEND="${DEPEND}"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-configure.patch
if ! use doc; then
# Remove doc target
sed -i -e "/SUBPROJECTS/s/Documentation//" GNUmakefile \
|| die "doc sed failed"
fi
+
+ eautoreconf
}
diff --git a/gnustep-libs/dbuskit/files/dbuskit-0.1-configure.patch b/gnustep-libs/dbuskit/files/dbuskit-0.1-configure.patch
new file mode 100644
index 000000000000..9a25bcef6adb
--- /dev/null
+++ b/gnustep-libs/dbuskit/files/dbuskit-0.1-configure.patch
@@ -0,0 +1,31 @@
+http://svn.gna.org/viewcvs/gnustep?view=revision&revision=34602
+Backport configure script improvements.
+--- libs/dbuskit/branches/0.1/configure.ac 2012/01/20 14:38:55 34601
++++ libs/dbuskit/branches/0.1/configure.ac 2012/01/20 14:39:24 34602
+@@ -4,8 +4,17 @@
+ LT_INIT
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CANONICAL_SYSTEM
++
++#Override the OBJC variable if it is empty and CC is also set.
++if test -n "$CC"; then
++ if test -z "$OBJC"; then
++ OBJC="$CC"
++ fi
++fi
++
+ AC_PROG_CC(clang gcc cc c1 egcs)
+ AC_PROG_CPP
++AC_PROG_OBJC(clang gcc objcc objc cc CC)
+ AC_LANG(Objective C)
+ PKG_PROG_PKG_CONFIG([])
+ AC_LANG_PUSH(C)
+@@ -129,7 +138,7 @@
+ fi
+
+ AC_SUBST(OBJC_RUNTIME_H)
+-
++AC_SUBST(OBJC)
+ CFLAGS="$saved_CFLAGS"
+ CPPFLAGS="$saved_CPPFLAGS"
+ LDFLAGS="$saved_LDFLAGS"