diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2011-07-13 17:36:22 +0000 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2011-07-13 17:36:22 +0000 |
| commit | d265f58ff14ceed60435ae5eabeb0fd4858e38e2 (patch) | |
| tree | f90b4a9fd0d27fb639c075f1a44fae05656d7846 /kde-misc | |
| parent | add dev-python/pygtksourceview dep (bug #375105 (diff) | |
| download | gentoo-2-d265f58ff14ceed60435ae5eabeb0fd4858e38e2.tar.gz gentoo-2-d265f58ff14ceed60435ae5eabeb0fd4858e38e2.tar.bz2 gentoo-2-d265f58ff14ceed60435ae5eabeb0fd4858e38e2.zip | |
Fix bug #372379.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/semantik/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-misc/semantik/files/semantik-0.7.3_p20091013-wscript_libstr.patch | 12 | ||||
| -rw-r--r-- | kde-misc/semantik/semantik-0.7.3_p20091013.ebuild | 7 |
3 files changed, 23 insertions, 3 deletions
diff --git a/kde-misc/semantik/ChangeLog b/kde-misc/semantik/ChangeLog index 752c7212a299..81d281742f04 100644 --- a/kde-misc/semantik/ChangeLog +++ b/kde-misc/semantik/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-misc/semantik # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/ChangeLog,v 1.2 2011/06/13 21:55:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/ChangeLog,v 1.3 2011/07/13 17:36:21 mschiff Exp $ + + 13 Jul 2011; Marc Schiffbauer <mschiff@gentoo.org> + semantik-0.7.3_p20091013.ebuild, + +files/semantik-0.7.3_p20091013-wscript_libstr.patch: + Fix bug #372379. Ocaml only provides str.a instead of libstr.a 13 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> semantik-0.7.3_p20091013.ebuild: diff --git a/kde-misc/semantik/files/semantik-0.7.3_p20091013-wscript_libstr.patch b/kde-misc/semantik/files/semantik-0.7.3_p20091013-wscript_libstr.patch new file mode 100644 index 000000000000..b943a7dd2185 --- /dev/null +++ b/kde-misc/semantik/files/semantik-0.7.3_p20091013-wscript_libstr.patch @@ -0,0 +1,12 @@ +diff -urN semantik-0.7.4.orig/wscript semantik-0.7.4/wscript +--- semantik-0.7.4.orig/wscript 2011-07-13 19:00:04.004405901 +0200 ++++ semantik-0.7.4/wscript 2011-07-13 19:02:14.853796943 +0200 +@@ -207,7 +207,7 @@ + conf.fatal('Compiling Semantik requires kde4 -devel') + + conf.env.OCALINKFLAGS_OPT_PP = 'str.cmxa' +- conf.env.LINKFLAGS_CAML = '-lasmrun -lstr -lnums'.split() ++ conf.env.LINKFLAGS_CAML = '-lasmrun -l:str.a -lnums'.split() + conf.env.LIBPATH_CAML = conf.env.OCAMLLIB + conf.env.LIB_CAML = "m".split() + conf.env.OCAMLFLAGS_TWT = '-pp default/util/ocamltwt'.split() #-unsafe -noassert -inline 10' diff --git a/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild b/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild index cefb04dcdf26..1b26e4eb4d7c 100644 --- a/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild +++ b/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild,v 1.2 2011/06/13 21:55:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild,v 1.3 2011/07/13 17:36:21 mschiff Exp $ EAPI=4 @@ -29,7 +29,10 @@ RDEPEND=" S="${WORKDIR}/semantik-0.7.4" WAF_BINARY="${S}/waf" -PATCHES=( "${FILESDIR}/${P}"-wscript_ldconfig.patch ) +PATCHES=( + "${FILESDIR}/${P}"-wscript_ldconfig.patch + "${FILESDIR}/${P}"-wscript_libstr.patch +) src_configure() { CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ |