diff options
| -rw-r--r-- | dev-db/metakit/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/metakit/Manifest | 6 | ||||
| -rw-r--r-- | dev-db/metakit/files/metakit-2.4.9.3-64bit.patch | 40 | ||||
| -rw-r--r-- | dev-db/metakit/files/metakit-2.4.9.7-LDFLAGS.patch | 31 | ||||
| -rw-r--r-- | dev-db/metakit/metakit-2.4.9.7.ebuild | 11 |
5 files changed, 47 insertions, 47 deletions
diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog index 51f8e3b33cdb..558e67b4dc56 100644 --- a/dev-db/metakit/ChangeLog +++ b/dev-db/metakit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/metakit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.48 2010/07/14 13:30:26 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.49 2010/07/14 13:42:44 arfrever Exp $ + + 14 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + metakit-2.4.9.7.ebuild, +files/metakit-2.4.9.7-LDFLAGS.patch: + Respect CXX during linking and LDFLAGS. 14 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> metakit-2.4.9.7.ebuild: diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest index 21b7e46ec604..f3967e5a268d 100644 --- a/dev-db/metakit/Manifest +++ b/dev-db/metakit/Manifest @@ -1,7 +1,7 @@ -AUX metakit-2.4.9.3-64bit.patch 1402 RMD160 a62370b09168ae6420bb5c109aaf354a1409c869 SHA1 f074f989818addd8a5345f9a148e0893563facdd SHA256 28884685e4627cfbd8e6bf0c2f0d7304f7d9495b2d63da435a64376779c74093 +AUX metakit-2.4.9.7-LDFLAGS.patch 1148 RMD160 f30d17cef819f8bd00546146211a9c8cc557bd63 SHA1 1bb0ab64acc15f2126fffbbffd437b6ca1f2e3fa SHA256 90257fbc82faee3b300fe1ffb950a8b5be2e2ad404456ad92c57b9e748090ac1 DIST metakit-2.4.9.6.tar.gz 868298 RMD160 f0515f21c6dfc96f912989155938d9e54b7d0810 SHA1 c8d1babae6d1569a188a77e8648c987a83c7f282 SHA256 bcaef27ca5f0ca44b189ccb0d6fc7e1f07b5781ee1ebda6b75edd8ed4acfe8e2 DIST metakit-2.4.9.7.tar.gz 868310 RMD160 e563c2187e66ed7a8ea0e9a16971e6ce777e3088 SHA1 1b75400038fcad941886deb0748e669c224bc995 SHA256 d1ba361d2d8517925cff5c23e8602822da9c8c347a75a15c225ec656ff7ca94d EBUILD metakit-2.4.9.6.ebuild 1708 RMD160 d114128fae2f783a190c8d2b211ef975d05ae194 SHA1 948c5dcd9d99600106aea86fedac985423372ccc SHA256 39d79163bbf2d7e7474cb13359c050dd74fedc31eefa85f74a347534ce193d17 -EBUILD metakit-2.4.9.7.ebuild 1967 RMD160 56ae79feed7c248fc7a4f91d2b63b8118be1762f SHA1 a688ff98441f173582a3dec0eb6c08aad83afe2f SHA256 abb79490f25969bfa75fa27374367e0bd268d3228e19e1ca7adab13ddf597c0b -MISC ChangeLog 5934 RMD160 7f4b5a1102cf7e8c6ee45773445c184562213575 SHA1 a34c86ede130ea732a3d9ad80f6aaa1833546d9f SHA256 d637b1b263b470723e7f943564d5c066601433dac2be84fe3a553eb89be13c3d +EBUILD metakit-2.4.9.7.ebuild 2131 RMD160 40a4f06a4505e3ea3663a8dd846b7a8251357371 SHA1 8fc79da317e7a38a68ee4e2a4dae2982e59dc83c SHA256 f3dae9e5627b31f2cb30bd9cd1b70dcad89bf6959f58aeb9ae112edccb8fac37 +MISC ChangeLog 6114 RMD160 baf4e71f9c1dda8fd0e27963d56552534deeec95 SHA1 44300d10e4a30df08b3af974d6db93ee0cabad3a SHA256 5d33ba43831424b38d0f36be9af1add39d5d19682f392243ef46edbb3c0252c7 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a diff --git a/dev-db/metakit/files/metakit-2.4.9.3-64bit.patch b/dev-db/metakit/files/metakit-2.4.9.3-64bit.patch deleted file mode 100644 index 5b91a8995cf3..000000000000 --- a/dev-db/metakit/files/metakit-2.4.9.3-64bit.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur metakit-2.4.9.3-orig/python/PyRowRef.cpp metakit-2.4.9.3/python/PyRowRef.cpp ---- metakit-2.4.9.3-orig/python/PyRowRef.cpp 2004-01-20 17:46:06.000000000 -0800 -+++ metakit-2.4.9.3/python/PyRowRef.cpp 2006-07-03 23:40:57.000000000 -0700 -@@ -24,12 +24,12 @@ - } - - static int PyRowRef_print(PyRowRef *o, FILE *f, int) { -- fprintf(f, "<PyRowRef object at %x>", (int)o); -+ fprintf(f, "<PyRowRef object at %p>", (long)o); - return 0; - } - - static int PyRORowRef_print(PyRowRef *o, FILE *f, int) { -- fprintf(f, "<PyRORowRef object at %x>", (int)o); -+ fprintf(f, "<PyRORowRef object at %p>", (long)o); - return 0; - } - -diff -Nur metakit-2.4.9.3-orig/python/PyView.cpp metakit-2.4.9.3/python/PyView.cpp ---- metakit-2.4.9.3-orig/python/PyView.cpp 2004-01-20 17:46:06.000000000 -0800 -+++ metakit-2.4.9.3/python/PyView.cpp 2006-07-03 23:40:57.000000000 -0700 -@@ -971,15 +971,15 @@ - } - - static int PyView_print(PyView *o, FILE *f, int) { -- fprintf(f, "<PyView object at %x>", (int)o); -+ fprintf(f, "<PyView object at %p", (long)o); - return 0; - } - static int PyViewer_print(PyView *o, FILE *f, int) { -- fprintf(f, "<PyViewer object at %x>", (int)o); -+ fprintf(f, "<PyViewer object at %p>", (long)o); - return 0; - } - static int PyROViewer_print(PyView *o, FILE *f, int) { -- fprintf(f, "<PyROViewer object at %x>", (int)o); -+ fprintf(f, "<PyROViewer object at %p>", (long)o); - return 0; - } - diff --git a/dev-db/metakit/files/metakit-2.4.9.7-LDFLAGS.patch b/dev-db/metakit/files/metakit-2.4.9.7-LDFLAGS.patch new file mode 100644 index 000000000000..210e42939717 --- /dev/null +++ b/dev-db/metakit/files/metakit-2.4.9.7-LDFLAGS.patch @@ -0,0 +1,31 @@ +--- unix/Makefile.in ++++ unix/Makefile.in +@@ -134,24 +134,24 @@ + ranlib $@ + + libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES) +- $(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) ++ $(SHLIB_LD) $(LDFLAGS) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) + + Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) + ar rcu $@ mk4tcl.o mk4too.o $(LOBJS) + ranlib $@ + + Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES) +- $(SHLIB_LD) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS) ++ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS) + + Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS) + ar cru $@ $(PYOBJS) $(LOBJS) + ranlib $@ + + Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES) +- $(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS) ++ $(SHLIB_LD) $(LDFLAGS) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS) + + Mk4lua$(SHLIB_SUFFIX): mk4lua.o $(LOBJS) $(LINK_SPECIAL_FILES) +- $(SHLIB_LD) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS) ++ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS) + + demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT) + $(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \ diff --git a/dev-db/metakit/metakit-2.4.9.7.ebuild b/dev-db/metakit/metakit-2.4.9.7.ebuild index 83cc982a574b..2248a2cfa4c1 100644 --- a/dev-db/metakit/metakit-2.4.9.7.ebuild +++ b/dev-db/metakit/metakit-2.4.9.7.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.6 2010/07/14 13:30:26 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.7 2010/07/14 13:42:44 arfrever Exp $ EAPI="3" PYTHON_DEPEND="python? 2" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.*" -inherit eutils multilib python +inherit eutils multilib python toolchain-funcs DESCRIPTION="Embedded database library" HOMEPAGE="http://www.equi4.com/metakit/" @@ -29,6 +29,10 @@ pkg_setup() { fi } +src_prepare() { + epatch "${FILESDIR}/${P}-LDFLAGS.patch" +} + src_configure() { local myconf mycxxflags use tcl && myconf+=" --with-tcl=/usr/include,/usr/$(get_libdir)" @@ -47,13 +51,14 @@ src_configure() { } src_compile() { - default + emake SHLIB_LD="$(tc-getCXX) -shared" || die "emake failed" if use python; then python_copy_sources building() { emake \ + SHLIB_LD="$(tc-getCXX) -shared" pyincludedir="$(python_get_includedir)" \ python } |