From fbbbacbd6212faf36a8b9849cbce6e8f8a027567 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Mon, 19 Feb 2007 08:27:18 +0000 Subject: [PATCH] Fix compilation for bug #151553. Rewrite ebuild to use epatch and other eutils helpers. Package-Manager: portage-2.1.2-r9 --- dev-db/framerd/ChangeLog | 10 ++++-- dev-db/framerd/Manifest | 36 ++++++++++--------- dev-db/framerd/files/digest-framerd-2.4.3-r1 | 2 ++ .../framerd/files/framerd-2.4.3-gcc41.patch | 22 ++++++++++++ .../files/framerd-2.4.3-setup.fdx.patch | 14 ++++++++ dev-db/framerd/files/setup.fdx.patch | 6 ---- dev-db/framerd/framerd-2.4.3-r1.ebuild | 28 +++++++++------ 7 files changed, 83 insertions(+), 35 deletions(-) create mode 100644 dev-db/framerd/files/framerd-2.4.3-gcc41.patch create mode 100644 dev-db/framerd/files/framerd-2.4.3-setup.fdx.patch delete mode 100644 dev-db/framerd/files/setup.fdx.patch diff --git a/dev-db/framerd/ChangeLog b/dev-db/framerd/ChangeLog index b5f84a75c7ea..42b688346804 100644 --- a/dev-db/framerd/ChangeLog +++ b/dev-db/framerd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/framerd -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/framerd/ChangeLog,v 1.14 2006/04/01 14:29:56 agriffis Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/framerd/ChangeLog,v 1.15 2007/02/19 08:27:18 dirtyepic Exp $ + + 19 Feb 2007; Ryan Hill + +files/framerd-2.4.3-gcc41.patch, +files/framerd-2.4.3-setup.fdx.patch, + -files/setup.fdx.patch, framerd-2.4.3-r1.ebuild: + Fix compilation for bug #151553. Rewrite ebuild to use epatch and other + eutils helpers. 01 Apr 2006; Aron Griffis framerd-2.4.3-r1.ebuild: Mark 2.4.3-r1 ~ia64 diff --git a/dev-db/framerd/Manifest b/dev-db/framerd/Manifest index ae4d48112980..dfe06e99053b 100644 --- a/dev-db/framerd/Manifest +++ b/dev-db/framerd/Manifest @@ -1,20 +1,24 @@ -AUX setup.fdx.patch 284 RMD160 a773fc0254acd4517e0c11dd07dc96384007b2ef SHA1 bc9c435e42aa72fee27fba2374db86d74bb9cd67 SHA256 9d7098302c63bd0d2c009b619d1ce3d19c1b4cfbea7443863a8dcc78a784da4f -MD5 7cad1d06a6bf5d4c6b5c5747087869af files/setup.fdx.patch 284 -RMD160 a773fc0254acd4517e0c11dd07dc96384007b2ef files/setup.fdx.patch 284 -SHA256 9d7098302c63bd0d2c009b619d1ce3d19c1b4cfbea7443863a8dcc78a784da4f files/setup.fdx.patch 284 -DIST framerd-2.4.3.tar.gz 1685197 -EBUILD framerd-2.4.3-r1.ebuild 1171 RMD160 3e90247fc80dcb210d7c4ca2cfa2541873fad7df SHA1 b7477be3673192c9e2b1ef0ee83f2561c47cfcb7 SHA256 49fd082ef6bc7e5a7b0f1534b6ea3bd18e3bea8d4bffca7f322f7593aa13eb3e -MD5 9b2117c03f58ec7b641c55ef2d8334b0 framerd-2.4.3-r1.ebuild 1171 -RMD160 3e90247fc80dcb210d7c4ca2cfa2541873fad7df framerd-2.4.3-r1.ebuild 1171 -SHA256 49fd082ef6bc7e5a7b0f1534b6ea3bd18e3bea8d4bffca7f322f7593aa13eb3e framerd-2.4.3-r1.ebuild 1171 -MISC ChangeLog 1354 RMD160 554173d5b3747bdfc280c8bc2c1cf903af6549ab SHA1 b28c946af75901b5d3788f161590a52eea756c2b SHA256 bda4308fa71b3bb1961ebc4f60206cab5bf88c198e05a59ca61229159a84aee9 -MD5 6cf64ca184194014f3a25d462c01aa53 ChangeLog 1354 -RMD160 554173d5b3747bdfc280c8bc2c1cf903af6549ab ChangeLog 1354 -SHA256 bda4308fa71b3bb1961ebc4f60206cab5bf88c198e05a59ca61229159a84aee9 ChangeLog 1354 +AUX framerd-2.4.3-gcc41.patch 1021 RMD160 612374ba716a67148c2e0601d0f581e512fd051a SHA1 8529a7366379447a62a18ef7cf4fd8307fe40a20 SHA256 f181d2077318d898ba1f52ecf3d5f42e427849993803fb2f554a84ce5ead42d3 +MD5 7fa1bd8fbc63c0c6834622f14fdaed27 files/framerd-2.4.3-gcc41.patch 1021 +RMD160 612374ba716a67148c2e0601d0f581e512fd051a files/framerd-2.4.3-gcc41.patch 1021 +SHA256 f181d2077318d898ba1f52ecf3d5f42e427849993803fb2f554a84ce5ead42d3 files/framerd-2.4.3-gcc41.patch 1021 +AUX framerd-2.4.3-setup.fdx.patch 665 RMD160 70acb2981532ed27caba3ab852d5a2a3ac1c2f06 SHA1 1cdc6cd5a0bc1797026616d06a65c4f790a28fa5 SHA256 ccde96917f4fec02d305e41d406187f210fcb2fe326a28a2fe0fff91f4a9d8e3 +MD5 6893f2802b09530924bbaa95c0d589df files/framerd-2.4.3-setup.fdx.patch 665 +RMD160 70acb2981532ed27caba3ab852d5a2a3ac1c2f06 files/framerd-2.4.3-setup.fdx.patch 665 +SHA256 ccde96917f4fec02d305e41d406187f210fcb2fe326a28a2fe0fff91f4a9d8e3 files/framerd-2.4.3-setup.fdx.patch 665 +DIST framerd-2.4.3.tar.gz 1685197 RMD160 85aec71a7bcec6fe259d541b3f4c125aea8d70c6 SHA1 ad6eb903bf98c4ce755f584ca7c3d982363ac95e SHA256 c4a8c2c5814179da879c7ed76f17f1d676b97ee297d9ec4ff5fabb92cc63d988 +EBUILD framerd-2.4.3-r1.ebuild 1131 RMD160 70f108c06de6c3ce3a0f4a3392ec4faa7698fc0e SHA1 a99f4bbbd46455f43d31202880a8def041c962a7 SHA256 a1f96a066564376d3f0cba4b18ff4a6a07cb7ed414c1d296728caac258983ace +MD5 bcaaff7c4911863ba8e0596de55ceabf framerd-2.4.3-r1.ebuild 1131 +RMD160 70f108c06de6c3ce3a0f4a3392ec4faa7698fc0e framerd-2.4.3-r1.ebuild 1131 +SHA256 a1f96a066564376d3f0cba4b18ff4a6a07cb7ed414c1d296728caac258983ace framerd-2.4.3-r1.ebuild 1131 +MISC ChangeLog 1621 RMD160 4e95c641ba633b877a152c9778a82c8250e5dfb2 SHA1 6915fbb9a904b30c9b8eae87da851dd22eb76620 SHA256 11928cf820dbd5f37b0df66a620eda1b107fed1053a2a2ae000b78cf6dd23fcc +MD5 9c5fab37e1d414ba0ed8638defbc9877 ChangeLog 1621 +RMD160 4e95c641ba633b877a152c9778a82c8250e5dfb2 ChangeLog 1621 +SHA256 11928cf820dbd5f37b0df66a620eda1b107fed1053a2a2ae000b78cf6dd23fcc ChangeLog 1621 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210 -MD5 8832d735ce7ad2d16791a623ed0ef91f files/digest-framerd-2.4.3-r1 66 -RMD160 011dfab9350b29884897d2309d393f533760121f files/digest-framerd-2.4.3-r1 66 -SHA256 718b8f9439c53d4384f7d70b833e6e621e301bcb13e04d51e53b3ed316ff8c2d files/digest-framerd-2.4.3-r1 66 +MD5 695e64b2054274a9925ecfb9cc2b465a files/digest-framerd-2.4.3-r1 244 +RMD160 285f6f0a8c6dcba616970bc47a723eb4806e26e9 files/digest-framerd-2.4.3-r1 244 +SHA256 ed9690eb414e7fbd6b9bc1faac8b684e7b9288cbe01bcb20ad677700fcfaefb9 files/digest-framerd-2.4.3-r1 244 diff --git a/dev-db/framerd/files/digest-framerd-2.4.3-r1 b/dev-db/framerd/files/digest-framerd-2.4.3-r1 index c1f78b76707a..3462e7d072ae 100644 --- a/dev-db/framerd/files/digest-framerd-2.4.3-r1 +++ b/dev-db/framerd/files/digest-framerd-2.4.3-r1 @@ -1 +1,3 @@ MD5 ad493f56f5dbcb6cbff9f6e29a3dfdfe framerd-2.4.3.tar.gz 1685197 +RMD160 85aec71a7bcec6fe259d541b3f4c125aea8d70c6 framerd-2.4.3.tar.gz 1685197 +SHA256 c4a8c2c5814179da879c7ed76f17f1d676b97ee297d9ec4ff5fabb92cc63d988 framerd-2.4.3.tar.gz 1685197 diff --git a/dev-db/framerd/files/framerd-2.4.3-gcc41.patch b/dev-db/framerd/files/framerd-2.4.3-gcc41.patch new file mode 100644 index 000000000000..a124e240c097 --- /dev/null +++ b/dev-db/framerd/files/framerd-2.4.3-gcc41.patch @@ -0,0 +1,22 @@ +diff -Naur framerd-2.4.3-orig/include/framerd/odb.h framerd-2.4.3/include/framerd/odb.h +--- framerd-2.4.3-orig/include/framerd/odb.h 2002-07-23 20:05:47.000000000 -0600 ++++ framerd-2.4.3/include/framerd/odb.h 2007-02-19 02:06:30.000000000 -0600 +@@ -139,6 +139,7 @@ + FRAMERD_EXPORT fd_lisp fd_get_oid_value(fd_lisp oref); + + #if (FD_USING_THREADS) ++extern struct FD_HASHTABLE _fd_oid_buckets[FD_OID_BUCKETS]; + FASTOP fd_lisp fd_oid_value(fd_lisp) UNUSED; + FASTOP fd_lisp fd_oid_value(fd_lisp obj) + { +diff -Naur framerd-2.4.3-orig/include/framerd/oids.h framerd-2.4.3/include/framerd/oids.h +--- framerd-2.4.3-orig/include/framerd/oids.h 2002-08-09 10:42:35.000000000 -0600 ++++ framerd-2.4.3/include/framerd/oids.h 2007-02-19 02:05:54.000000000 -0600 +@@ -146,7 +146,6 @@ + #define FD_MAKE_OID fd_make_oid + #endif /* not FD_INLINE_OIDS */ + +-DTYPES_EXPORT struct FD_HASHTABLE _fd_oid_buckets[FD_OID_BUCKETS]; + + /* Note that we don't have to do OID locking when saving values here because, + the hashtables do it for us. */ diff --git a/dev-db/framerd/files/framerd-2.4.3-setup.fdx.patch b/dev-db/framerd/files/framerd-2.4.3-setup.fdx.patch new file mode 100644 index 000000000000..bdc278c9d956 --- /dev/null +++ b/dev-db/framerd/files/framerd-2.4.3-setup.fdx.patch @@ -0,0 +1,14 @@ +diff -Naur framerd-2.4.3-orig/etc/setup.fdx framerd-2.4.3/etc/setup.fdx +--- framerd-2.4.3-orig/etc/setup.fdx 2002-08-13 06:48:59.000000000 -0600 ++++ framerd-2.4.3/etc/setup.fdx 2007-02-19 02:15:31.000000000 -0600 +@@ -124,8 +124,8 @@ + (unless win32p + (system "chmod go-w " (destdir config-file))) + (lineout ">>> Wrote out FramerD configuration into " (destdir config-file)) +-(unless (file-exists? (destdir (stringout framerd-lib "/servers"))) +- (call-with-output-file (destdir (stringout framerd-lib "/servers")) ++(unless (file-exists? (stringout framerd-lib "/servers")) ++ (call-with-output-file (stringout framerd-lib "/servers") + (lambda (port) #f))) + + diff --git a/dev-db/framerd/files/setup.fdx.patch b/dev-db/framerd/files/setup.fdx.patch deleted file mode 100644 index 910722144882..000000000000 --- a/dev-db/framerd/files/setup.fdx.patch +++ /dev/null @@ -1,6 +0,0 @@ -127,128c127,128 -< (unless (file-exists? (destdir (stringout framerd-lib "/servers"))) -< (call-with-output-file (destdir (stringout framerd-lib "/servers")) ---- -> (unless (file-exists? (stringout framerd-lib "/servers")) -> (call-with-output-file (stringout framerd-lib "/servers") diff --git a/dev-db/framerd/framerd-2.4.3-r1.ebuild b/dev-db/framerd/framerd-2.4.3-r1.ebuild index bc72bf8c606c..2535c23a0534 100644 --- a/dev-db/framerd/framerd-2.4.3-r1.ebuild +++ b/dev-db/framerd/framerd-2.4.3-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/framerd/framerd-2.4.3-r1.ebuild,v 1.14 2006/04/01 14:29:56 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/framerd/framerd-2.4.3-r1.ebuild,v 1.15 2007/02/19 08:27:18 dirtyepic Exp $ + +inherit eutils DESCRIPTION="FramerD is a portable distributed object-oriented database designed to support the maintenance and sharing of knowledge bases." HOMEPAGE="http://www.framerd.org/" @@ -11,19 +13,23 @@ SLOT="0" KEYWORDS="~ia64 x86" IUSE="readline" -DEPEND="virtual/libc - readline? ( >=sys-libs/readline-4.1-r4 )" +DEPEND="readline? ( >=sys-libs/readline-4.1-r4 )" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-gcc41.patch + epatch "${FILESDIR}"/${P}-setup.fdx.patch +} src_compile() { - patch -p0 ${S}/etc/setup.fdx ${FILESDIR}/setup.fdx.patch - MY_OPTS="--enable-shared" - if ! use readline; then - MY_OPTS="${MY_OPTS} --without-readline" - fi - econf ${MY_OPTS} || die "econf failed" + econf \ + $(use_with readline) \ + --enable-shared \ + || die "econf failed" emake || die "make failed" - #emake test || die "make test failed" # failed!! } src_install() { -- 2.26.2