From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../vte/vte/0001-Add-m4-vapigen.m4.patch | 119 +++++++++++++++++++++ ...-Don-t-enable-stack-protection-by-default.patch | 29 +++++ poky/meta/recipes-support/vte/vte_0.50.2.bb | 48 +++++++++ 3 files changed, 196 insertions(+) create mode 100644 poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch create mode 100644 poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch create mode 100644 poky/meta/recipes-support/vte/vte_0.50.2.bb (limited to 'poky/meta/recipes-support/vte') diff --git a/poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch b/poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch new file mode 100644 index 000000000..1c5630ed9 --- /dev/null +++ b/poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch @@ -0,0 +1,119 @@ +From 08ca1c48b25c332b75bba2a6b5d757da006e955b Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Fri, 7 Oct 2016 16:27:57 +0300 +Subject: [PATCH] Add m4/vapigen.m4 + +Building without vala will fail if we don't have a vapigen.m4. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen +--- + m4/vapigen.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 96 insertions(+) + create mode 100644 m4/vapigen.m4 + +diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 +new file mode 100644 +index 0000000..f2df12f +--- /dev/null ++++ b/m4/vapigen.m4 +@@ -0,0 +1,96 @@ ++dnl vapigen.m4 ++dnl ++dnl Copyright 2012 Evan Nemerson ++dnl ++dnl This library is free software; you can redistribute it and/or ++dnl modify it under the terms of the GNU Lesser General Public ++dnl License as published by the Free Software Foundation; either ++dnl version 2.1 of the License, or (at your option) any later version. ++dnl ++dnl This library is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl Lesser General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU Lesser General Public ++dnl License along with this library; if not, write to the Free Software ++dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT]) ++# -------------------------------------- ++# Check vapigen existence and version ++# ++# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation ++AC_DEFUN([VAPIGEN_CHECK], ++[ ++ AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0]) ++ AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0]) ++ ++ AC_ARG_ENABLE([vala], ++ [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ ++ AS_IF([test "x$4" = "x"], [ ++ enable_vala=auto ++ ], [ ++ enable_vala=$4 ++ ]) ++ ]) ++ ++ AS_CASE([$enable_vala], [no], [enable_vala=no], ++ [yes], [ ++ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ ++ AC_MSG_ERROR([Vala bindings require GObject Introspection]) ++ ]) ++ ], [auto], [ ++ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ ++ enable_vala=no ++ ]) ++ ], [ ++ AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) ++ ]) ++ ++ AS_IF([test "x$2" = "x"], [ ++ vapigen_pkg_name=vapigen ++ ], [ ++ vapigen_pkg_name=vapigen-$2 ++ ]) ++ AS_IF([test "x$1" = "x"], [ ++ vapigen_pkg="$vapigen_pkg_name" ++ ], [ ++ vapigen_pkg="$vapigen_pkg_name >= $1" ++ ]) ++ ++ PKG_PROG_PKG_CONFIG ++ ++ PKG_CHECK_EXISTS([$vapigen_pkg], [ ++ AS_IF([test "$enable_vala" = "auto"], [ ++ enable_vala=yes ++ ]) ++ ], [ ++ AS_CASE([$enable_vala], [yes], [ ++ AC_MSG_ERROR([$vapigen_pkg not found]) ++ ], [auto], [ ++ enable_vala=no ++ ]) ++ ]) ++ ++ AC_MSG_CHECKING([for vala]) ++ ++ AS_CASE([$enable_vala], ++ [yes], [ ++ VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` ++ VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen ++ AS_IF([test "x$2" = "x"], [ ++ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` ++ ], [ ++ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` ++ ]) ++ ]) ++ ++ AC_MSG_RESULT([$enable_vala]) ++ ++ AC_SUBST([VAPIGEN]) ++ AC_SUBST([VAPIGEN_VAPIDIR]) ++ AC_SUBST([VAPIGEN_MAKEFILE]) ++ ++ AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") ++]) +-- +2.1.4 + diff --git a/poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch b/poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch new file mode 100644 index 000000000..fcfc55975 --- /dev/null +++ b/poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch @@ -0,0 +1,29 @@ +From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Mon, 13 Jun 2016 11:05:00 +0300 +Subject: [PATCH] Don't enable stack-protection by default + +These are set by security_flags.inc. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Jussi Kukkonen +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 068d072..d580f84 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl + -fno-common dnl + -fdiagnostics-show-option dnl + -fno-strict-aliasing dnl +- -fstack-protector dnl +- -fstack-protector-strong dnl + -fno-semantic-interposition dnl + -Wno-deprecated-declarations dnl + ]) +-- +2.1.4 + diff --git a/poky/meta/recipes-support/vte/vte_0.50.2.bb b/poky/meta/recipes-support/vte/vte_0.50.2.bb new file mode 100644 index 000000000..8b9ee33ec --- /dev/null +++ b/poky/meta/recipes-support/vte/vte_0.50.2.bb @@ -0,0 +1,48 @@ +SUMMARY = "Virtual terminal emulator GTK+ widget library" +BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" +LICENSE = "LGPLv2.1+" +DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection + +# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) +SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ + ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ + " +SRC_URI[archive.md5sum] = "1912cfd1d9cdd30cebeb908507acadc5" +SRC_URI[archive.sha256sum] = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +# Instead of "inherit vala" we do the relevant settings here so we can +# set DEPENDS based on PACKAGECONFIG. + +# Our patched version of Vala looks in STAGING_DATADIR for .vapi files +export STAGING_DATADIR +# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files +export XDG_DATA_DIRS = "${STAGING_DATADIR}" + +# Help g-ir-scanner find the .so for linking +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" +} + +# Package additional files +FILES_${PN}-dev += "${datadir}/vala/vapi/*" + +PACKAGECONFIG ??= "gnutls" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala,vala-native vala" +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" + +CFLAGS += "-D_GNU_SOURCE" + +EXTRA_OECONF = "--disable-test-application" + +# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. +# Use libtool-cross (which has a hack to prevent that) instead. +EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" + +PACKAGES =+ "libvte" +FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" -- cgit v1.2.3