public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 01/28] source-highlight: add a recipe
Date: Fri, 26 Aug 2016 17:28:16 +0300	[thread overview]
Message-ID: <cf5764cb583333f3585a18bf7f2ad5cce6d47ad7.1472221205.git.alexander.kanavin@linux.intel.com> (raw)
In-Reply-To: <cover.1472221205.git.alexander.kanavin@linux.intel.com>
In-Reply-To: <cover.1472221205.git.alexander.kanavin@linux.intel.com>

gtk-doc relies on this to highlight source code snippets

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/conf/distro/include/security_flags.inc        |  1 +
 ...light.pc.in-do-not-add-Boost-s-libraries-.patch | 30 ++++++++++++++++++++++
 .../source-highlight/source-highlight_3.1.8.bb     | 28 ++++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch
 create mode 100644 meta/recipes-support/source-highlight/source-highlight_3.1.8.bb

diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 20f48de..1c1e50b 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -80,6 +80,7 @@ SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-rpm = "${lcl_maybe_fortify} -fstack-protector"
 SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-slang = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-uclibc = ""
diff --git a/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch b/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch
new file mode 100644
index 0000000..b0aa5d1
--- /dev/null
+++ b/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch
@@ -0,0 +1,30 @@
+From 9aa01fd5f9d8b2b98c34684dc8f68115750ef41c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 12 Jul 2016 17:15:13 +0300
+Subject: [PATCH] source-highlight.pc.in: do not add Boost's libraries and
+ includes
+
+This breaks when compiling in sysroots; a proper way is to use Depends
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ source-highlight.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source-highlight.pc.in b/source-highlight.pc.in
+index 79ab63e..64114a7 100644
+--- a/source-highlight.pc.in
++++ b/source-highlight.pc.in
+@@ -7,6 +7,6 @@ Name: libsource-highlight
+ Description: GNU Source-highlight library.
+ URL: http://www.gnu.org/software/src-highlite/
+ Version: @VERSION@
+-Libs: -L${libdir} -lsource-highlight @BOOST_LDFLAGS@ @BOOST_REGEX_LIB@
+-Cflags: -I${includedir} @BOOST_CPPFLAGS@
++Libs: -L${libdir} -lsource-highlight
++Cflags: -I${includedir}
+ 
+-- 
+2.8.1
+
diff --git a/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb b/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
new file mode 100644
index 0000000..37d2fa9
--- /dev/null
+++ b/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Syntax highlight utility"
+DESCRIPTION = "Source-highlight converts source code to formatted text with syntax highlighting."
+HOMEPAGE = "https://www.gnu.org/software/src-highlite/"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb"
+
+SRC_URI = "${GNU_MIRROR}/src-highlite/${BPN}-${PV}.tar.gz \
+           file://0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch"
+SRC_URI[md5sum] = "3243470706ef5fefdc3e43b5306a4e41"
+SRC_URI[sha256sum] = "01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3"
+
+inherit autotools
+
+DEPENDS_append = " boost"
+
+DEPENDS_append_class-target = " source-highlight-native"
+
+EXTRA_OECONF = "--with-boost=${PKG_CONFIG_SYSROOT_DIR}/${prefix}"
+
+BBCLASSEXTEND = "native"
+
+# source-highlight is using its own binary from the build tree to make documentation
+# let's substitute the native binary instead
+do_configure_prepend_class-target () {
+        sed -i -e 's,^SRCHILITEEXE = $(top_builddir).*,SRCHILITEEXE = source-highlight,' ${S}/doc/Makefile.am
+}
+
+RDEPENDS_source-highlight += "bash"
-- 
2.9.3



  reply	other threads:[~2016-08-26 14:30 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-26 14:28 [PATCH 00/28] Enable gtk-doc Alexander Kanavin
2016-08-26 14:28 ` Alexander Kanavin [this message]
2016-08-26 14:28 ` [PATCH 02/28] gtk-doc: add a recipe, remove gtk-doc-stub Alexander Kanavin
2016-08-26 14:28 ` [PATCH 03/28] bitbake.conf: add "api-documentation" to default distro features Alexander Kanavin
2016-08-26 14:28 ` [PATCH 04/28] gtk-doc.bbclass: enable building gtk-doc based documentation Alexander Kanavin
2016-08-26 14:28 ` [PATCH 05/28] kmod: do not let gtkdocize fail Alexander Kanavin
2016-08-26 14:28 ` [PATCH 06/28] systemd: drop unused gtkdoc-related variable Alexander Kanavin
2016-08-26 14:28 ` [PATCH 07/28] libglade: remove the recipe Alexander Kanavin
2016-08-26 14:28 ` [PATCH 08/28] gstreamer1.0: enable gtk-doc support Alexander Kanavin
2016-08-26 14:28 ` [PATCH 09/28] webkitgtk: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 10/28] gcr: disable gtk-doc on x86_64 Alexander Kanavin
2016-08-26 14:28 ` [PATCH 11/28] gcr, libsecret, webkitgtk: disable gtk-doc on mips64 Alexander Kanavin
2016-08-26 14:28 ` [PATCH 12/28] webkitgtk: re-enable introspection on powerpc Alexander Kanavin
2016-08-26 14:28 ` [PATCH 13/28] dbus-glib: enable gtk-doc Alexander Kanavin
2016-08-26 14:28 ` [PATCH 14/28] orc: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 15/28] libidn: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 16/28] libuser: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 17/28] gdk-pixbuf: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 18/28] gnome-desktop3: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 19/28] json-glib: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 20/28] libgudev: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 21/28] libenck3: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 22/28] cairo: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 23/28] harfbuzz: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 24/28] gnutls: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 25/28] libtasn1: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 26/28] libsoup-2.4: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 27/28] p11-kit: " Alexander Kanavin
2016-08-26 14:28 ` [PATCH 28/28] util-linux: do not enable gtk-doc and explain why Alexander Kanavin
2016-08-31  7:48 ` [PATCH 00/28] Enable gtk-doc Richard Purdie
2016-09-01 21:59 ` Randy MacLeod
2016-09-02 15:06   ` Alexander Kanavin
2016-09-05  6:58     ` Anders Darander
2016-09-09 13:42       ` Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cf5764cb583333f3585a18bf7f2ad5cce6d47ad7.1472221205.git.alexander.kanavin@linux.intel.com \
    --to=alexander.kanavin@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox