diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-libs/link-grammar/files | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-libs/link-grammar/files')
| -rw-r--r-- | dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch | 23 | ||||
| -rw-r--r-- | dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch | 33 |
2 files changed, 56 insertions, 0 deletions
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch new file mode 100644 index 000000000000..2d97b7cc7627 --- /dev/null +++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch @@ -0,0 +1,23 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -137,8 +137,7 @@ + AC_SUBST(HOST_OS) + # ==================================================================== + +-CFLAGS="${CFLAGS} -O3" +-CXXFLAGS="${CXXFLAGS} -O3 -Wall" ++CXXFLAGS="${CXXFLAGS} -Wall" + + # The std=c11 flag provides the proper float-pt math decls working, + # e.g. fmax However, it also undefined _BSD_SOURCE, etc. which is +@@ -908,10 +907,6 @@ + + AC_FUNC_STRERROR_R + +-AC_SUBST(CFLAGS) +-AC_SUBST(CPPFLAGS) +-AC_SUBST(CXXFLAGS) +- + dnl Save the compilation definitions for an extended version printout + AC_OUTPUT_MAKE_DEFS() + LG_DEFS=`$ECHO "$DEFS" | $SED 's/\\\\//g'` diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch new file mode 100644 index 000000000000..1616e933664e --- /dev/null +++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch @@ -0,0 +1,33 @@ +--- a/bindings/python/Makefile.am ++++ b/bindings/python/Makefile.am +@@ -4,8 +4,8 @@ + # Created by Linas Vepstas February 2014 + # + # +-SWIG_SOURCES = ../swig/link_grammar.i +-SWIG_INCLUDES = ../../link-grammar/link-includes.h ++SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i ++SWIG_INCLUDES = $(top_srcdir)/link-grammar/link-includes.h + built_c_sources = lg_python_wrap.cc + built_py_sources = $(top_builddir)/bindings/python/clinkgrammar.py + +@@ -18,16 +18,16 @@ + + # Files that get installed in $pkgpythondir + pkgpython_PYTHON = \ +- linkgrammar.py \ ++ $(srcdir)/linkgrammar.py \ + $(top_builddir)/bindings/python/__init__.py \ +- $(top_builddir)/bindings/python/clinkgrammar.py ++ $(built_py_sources) + + # Apparently, anaconda does not work without this!? + # This seems wrong and lame to me, but see issue #298 + # https://github.com/opencog/link-grammar/issues/298 + pkgpypathdir=$(pythondir) + pkgpypath_PYTHON = \ +- linkgrammar.pth ++ $(srcdir)/linkgrammar.pth + + # The make uninstall target should remove directories we created. + uninstall-hook: |