summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2008-11-25 08:20:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2008-11-25 08:20:02 +0000
commit9e4519404955ea74a741cce60c554bad181b50f7 (patch)
tree538579c259b2d53862cf196f176695d5800b4088 /app-misc/toilet
parentfixed configure and build issues, added manual install commands (diff)
downloadhistorical-9e4519404955ea74a741cce60c554bad181b50f7.tar.gz
historical-9e4519404955ea74a741cce60c554bad181b50f7.tar.bz2
historical-9e4519404955ea74a741cce60c554bad181b50f7.zip
LDADD -lcaca instead of -lcucul for bug 246907 for forced --as-needed. This is what upstream is trying to do with original Makefile.am, using pkg-config --libs cucul in LDFLAGS which returns -lcaca on system built with asneeded.
Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r3 i686
Diffstat (limited to 'app-misc/toilet')
-rw-r--r--app-misc/toilet/ChangeLog9
-rw-r--r--app-misc/toilet/Manifest4
-rw-r--r--app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch2
3 files changed, 11 insertions, 4 deletions
diff --git a/app-misc/toilet/ChangeLog b/app-misc/toilet/ChangeLog
index 11b078287963..8614d77c2ed2 100644
--- a/app-misc/toilet/ChangeLog
+++ b/app-misc/toilet/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-misc/toilet
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/ChangeLog,v 1.8 2008/11/24 16:40:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/ChangeLog,v 1.9 2008/11/25 08:20:02 ssuominen Exp $
+
+ 25 Nov 2008; <ssuominen@gentoo.org>
+ files/toilet-0.1-asneeded-and-cflags.patch:
+ LDADD -lcaca instead of -lcucul for bug 246907 for forced --as-needed.
+ This is what upstream is trying to do with original Makefile.am, using
+ pkg-config --libs cucul in LDFLAGS which returns -lcaca on system built
+ with asneeded.
24 Nov 2008; <ssuominen@gentoo.org> metadata.xml:
Rename my old e-mail drac at gentoo.org to ssuominen at gentoo.org.
diff --git a/app-misc/toilet/Manifest b/app-misc/toilet/Manifest
index c346719e1efe..b82f122a64c6 100644
--- a/app-misc/toilet/Manifest
+++ b/app-misc/toilet/Manifest
@@ -1,5 +1,5 @@
-AUX toilet-0.1-asneeded-and-cflags.patch 1118 RMD160 9a18d091f7b0086752a686481f7d76a5e36cb0cd SHA1 a2b7af263d0fd74699376864129348fd7a56c2ed SHA256 9bb26489aad898e30ec6b676bd416fa062eded36653fb867697c5d321eb3a5e6
+AUX toilet-0.1-asneeded-and-cflags.patch 1117 RMD160 735d59fea180cfad2908fd76ebc620857c51eb41 SHA1 30eb0930cc5f92394f03a18385d17705c6e7ed08 SHA256 e2c00516e85e006a896d842d66f5e95dc1b0935bcf6872b7dbf53aaa00e2c990
DIST toilet-0.1.tar.gz 429493 RMD160 eca05221d5e5b30a3ccc7c16be875a952d0ae793 SHA1 103e64e2bec848e49e2109dea5adb19a751ed721 SHA256 626663a5dbed9c1c5844480b91812f0be4fe8c3c0135f44ef76490f79632d2da
EBUILD toilet-0.1.ebuild 783 RMD160 580c05f781220db9526b73636b83e9ed48c96e9d SHA1 57e49d233db75b488dc77a9313d0d782385e4f92 SHA256 3e2a6714015d8be1f37ad157c3a244350e5e553b7cbed9cb5c768baef5ac99a9
-MISC ChangeLog 1065 RMD160 4f04962c9508284fb2d5ff9f7816fc905069353d SHA1 334109c5515a411d4a638667e5ca375a195525ab SHA256 cc609682f395b0ed8091f6dea3bacf4d8f57f802ef2ea0fbfbc7f895698bd8ca
+MISC ChangeLog 1387 RMD160 f97f2b10a9de9d2bbf050b3bc4d0c17f0b0821ad SHA1 e20e4286293ef59a07a707b9867ef1f80d8c1069 SHA256 408613593246646dc58d03ab5ad10c4b1641060ac7dd5e544ae1c19e485102f2
MISC metadata.xml 228 RMD160 711ba636f4e544ee43b56a5e2f6e2b385b3a54b6 SHA1 cb84aac4210de3076c38692ce64836b1991fcce8 SHA256 ef226d517277e0362aa2169caa307280ebb63f24d75b9883942aaa8fafa59df7
diff --git a/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch b/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch
index 5fdf0c1993a4..08f3bf726382 100644
--- a/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch
+++ b/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch
@@ -19,4 +19,4 @@ diff -ur toilet-0.1.orig/src/Makefile.am toilet-0.1/src/Makefile.am
toilet_CFLAGS = `pkg-config --cflags cucul`
-toilet_LDFLAGS = `pkg-config --libs cucul` @GETOPT_LIBS@ @ZLIB_LIBS@
-
-+toilet_LDADD = -lcucul @GETOPT_LIBS@ @ZLIB_LIBS@
++toilet_LDADD = -lcaca @GETOPT_LIBS@ @ZLIB_LIBS@