summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-03-09 17:01:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:44 +0000
commit96b5847a339d01fb90105afa63fa3848e8213266 (patch)
tree192f05d7df43129e9df02ab3b709d498a7366c2a
parent3a1d9fbe96a6ce836919e5d7c28ac95ab77038a9 (diff)
downloadpoky-96b5847a339d01fb90105afa63fa3848e8213266.tar.gz
gtk-doc-stub: remove introspection stubs
As we provide the full introspection support, we need to remove the stubs from this package that conflict with it. (From OE-Core rev: da023f17f92e2815b3cfbbee66ec4c83223f1aee) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk-doc-stub/files/0001-Revert-Import-introspection-stub-machinery-too.patch305
-rw-r--r--meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb6
2 files changed, 309 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gtk-doc-stub/files/0001-Revert-Import-introspection-stub-machinery-too.patch b/meta/recipes-gnome/gtk-doc-stub/files/0001-Revert-Import-introspection-stub-machinery-too.patch
new file mode 100644
index 0000000000..80b0521d48
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc-stub/files/0001-Revert-Import-introspection-stub-machinery-too.patch
@@ -0,0 +1,305 @@
1From d636be29bf95396b4e27fcd17ff84cb7091cca91 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 8 Oct 2015 15:37:40 +0300
4Subject: [PATCH] Revert "Import introspection stub machinery too"
5
6This reverts commit 3dfd0a09de696ec8c544762747f8a0f77153622e.
7As we provide the full introspection support, we need to remove
8the stubs from this package that conflict with it.
9
10Upstream-Status: Pending [review on oe-core list]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 Makefile | 4 --
14 Makefile.introspection | 163 -------------------------------------------------
15 introspection.m4 | 96 -----------------------------
16 3 files changed, 263 deletions(-)
17 delete mode 100644 Makefile.introspection
18 delete mode 100644 introspection.m4
19
20diff --git a/Makefile b/Makefile
21index 7cb6ce5..ad4231a 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -23,7 +23,3 @@ install: $(bin_programs)
25
26 mkdir -p $(DESTDIR)$(datarootdir)/aclocal/
27 install -m 0644 $(srcdir)/gtk-doc.m4 $(DESTDIR)$(datarootdir)/aclocal/gtk-doc.m4
28-
29- mkdir -p $(DESTDIR)$(datarootdir)/gobject-introspection-1.0
30- install -m 0644 $(srcdir)/Makefile.introspection $(DESTDIR)$(datarootdir)/gobject-introspection-1.0/Makefile.introspection
31- install -m 0644 $(srcdir)/introspection.m4 $(DESTDIR)$(datarootdir)/aclocal/introspection.m4
32diff --git a/Makefile.introspection b/Makefile.introspection
33deleted file mode 100644
34index 755dd15..0000000
35--- a/Makefile.introspection
36+++ /dev/null
37@@ -1,163 +0,0 @@
38-# -*- Mode: make -*-
39-# Copyright 2009-2010 Johan Dahlin
40-#
41-# This file is free software; the author(s) gives unlimited
42-# permission to copy and/or distribute it, with or without
43-# modifications, as long as this notice is preserved.
44-#
45-# * Input variables:
46-#
47-# INTROSPECTION_GIRS - List of GIRS that should be generated
48-# INTROSPECTION_SCANNER - Command to invoke scanner, normally set by
49-# GOBJECT_INTROSPECTION_REQUIRE/CHECK() in introspection.m4
50-# INTROSPECTION_SCANNER_ARGS - Additional args to pass in to the scanner
51-# INTROSPECTION_SCANNER_ENV - Environment variables to set before running
52-# the scanner
53-# INTROSPECTION_COMPILER - Command to invoke compiler, normally set by
54-# GOBJECT_INTROSPECTION_REQUIRE/CHECK() in introspection.m4
55-# INTROSPECTION_COMPILER_ARGS - Additional args to pass in to the compiler
56-#
57-# * Simple tutorial
58-#
59-# Add this to configure.ac:
60-# -Wno-portability to AM_INIT_AUTOMAKE
61-# GOBJECT_INTROSPECTION_CHECK([0.6.7])
62-#
63-# Add this to Makefile.am where your library/program is built:
64-# include $(INTROSPECTION_MAKEFILE)
65-# INTROSPECTION_GIRS = YourLib-1.0.gir
66-# YourLib_1_0_gir_NAMESPACE = YourLib
67-# YourLib_1_0_gir_VERSION = 1.0
68-# YourLib_1_0_gir_LIBS = libyourlib.la
69-# YourLib_1_0_gir_FILES = $(libyourlib_1_0_SOURCES)
70-# girdir = $(datadir)/gir-1.0
71-# dist_gir_DATA = YourLib-1.0.gir
72-# typelibdir = $(libdir)/girepository-1.0
73-# typelib_DATA = YourLib-1.0.typelib
74-# CLEANFILES = $(dist_gir_DATA) $(typelib_DATA)
75-#
76-
77-# Make sure the required variables are set, these should under normal
78-# circumstances come from introspection.m4
79-$(if $(INTROSPECTION_SCANNER),,$(error Need to define INTROSPECTION_SCANNER))
80-$(if $(INTROSPECTION_COMPILER),,$(error Need to define INTROSPECTION_COMPILER))
81-
82-# Private functions
83-
84-## Transform the gir filename to something which can reference through a variable
85-## without automake/make complaining, eg Gtk-2.0.gir -> Gtk_2_0_gir
86-_gir_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1))))
87-
88-# Namespace and Version is either fetched from the gir filename
89-# or the _NAMESPACE/_VERSION variable combo
90-_gir_namespace = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1)))))
91-_gir_version = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=))))
92-
93-# _PROGRAM is an optional variable which needs it's own --program argument
94-_gir_program = $(if $($(_gir_name)_PROGRAM),--program=$($(_gir_name)_PROGRAM))
95-
96-# Variables which provides a list of things
97-_gir_libraries = $(foreach lib,$($(_gir_name)_LIBS),--library=$(lib))
98-_gir_packages = $(foreach pkg,$($(_gir_name)_PACKAGES),--pkg=$(pkg))
99-_gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
100-_gir_export_packages = $(foreach pkg,$($(_gir_name)_EXPORT_PACKAGES),--pkg-export=$(pkg))
101-
102-# Reuse the LIBTOOL variable from automake if it's set, but
103-# work around MSYS weirdness: When running g-ir-scanner, MSYS changes
104-# a command-line argument --libtool="/bin/sh ../../libtool" into
105-# --libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
106-# because we already "know" where the libtool configure produced is.
107-_gir_libtool = $(if $(findstring MINGW32,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
108-
109-# Macros for AM_SILENT_RULES prettiness
110-_gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
111-
112-_gir_silent_scanner_prefix = $(_gir_silent_scanner_prefix_$(V))
113-_gir_silent_scanner_prefix_ = $(_gir_silent_scanner_prefix_$(_gir_verbosity))
114-_gir_silent_scanner_prefix_0 = @echo " GISCAN $(1)";
115-_gir_silent_scanner_opts = $(_gir_silent_scanner_opts_$(V))
116-_gir_silent_scanner_opts_ = $(_gir_silent_scanner_opts_$(_gir_verbosity))
117-_gir_silent_scanner_opts_0 = --quiet
118-
119-_gir_silent_compiler = $(_gir_silent_compiler_$(V))
120-_gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
121-_gir_silent_compiler_0 = @echo " GICOMP $(1)";
122-
123-#
124-# Creates a GIR by scanning C headers/sources
125-# $(1) - Name of the gir file (output)
126-#
127-# If output is Gtk-2.0.gir then you should name the variables like
128-# Gtk_2_0_gir_NAMESPACE, Gtk_2_0_gir_VERSION etc.
129-# Required variables:
130-# FILES - C sources and headers which should be scanned
131-#
132-# One of these variables are required:
133-# LIBS - Library where the symbol represented in the gir can be found
134-# PROGRAM - Program where the symbol represented in the gir can be found
135-#
136-# Optional variables
137-# NAMESPACE - Namespace of the gir, first letter capital,
138-# rest should be lower case, for instance: 'Gtk', 'Clutter', 'ClutterGtk'.
139-# If not present the namespace will be fetched from the gir filename,
140-# the part before the first dash. For 'Gtk-2.0', namespace will be 'Gtk'.
141-# VERSION - Version of the gir, if not present, will be fetched from gir
142-# filename, the part after the first dash. For 'Gtk-2.0', version will be '2.0'.
143-# LIBTOOL - Command to invoke libtool, usually set by automake
144-# SCANNERFLAGS - Flags to pass in to the scanner, see g-ir-scanner(1) for a list
145-# CFLAGS - Flags to pass in to the parser when scanning headers
146-# LDFLAGS - Linker flags used by the scanner
147-# PACKAGES - list of pkg-config names which cflags are required to parse
148-# the headers of this gir
149-# INCLUDES - Gir files to include without the .gir suffix, for instance
150-# GLib-2.0, Gtk-2.0. This is needed for all libraries which you depend on that
151-# provides introspection information.
152-# EXPORT_PACKAGES - list of pkg-config names that are provided by this gir.
153-# By default the names in the PACKAGES variable will be used.
154-#
155-
156-define introspection-scanner
157-
158-# Basic sanity check, to make sure required variables are set
159-$(if $($(_gir_name)_FILES),,$(error Need to define $(_gir_name)_FILES))
160-$(if $(or $(findstring --header-only,$($(_gir_name)_SCANNERFLAGS)),
161- $($(_gir_name)_LIBS),
162- $($(_gir_name)_PROGRAM)),,
163- $(error Need to define $(_gir_name)_LIBS or $(_gir_name)_PROGRAM))
164-
165-# Only dependencies we know are actually filenames goes into _FILES, make
166-# sure these are built before running the scanner. Libraries and programs
167-# needs to be added manually.
168-$(1): $$($(_gir_name)_FILES)
169- @ $(MKDIR_P) $(dir $(1))
170- $(_gir_silent_scanner_prefix) $(INTROSPECTION_SCANNER_ENV) $(INTROSPECTION_SCANNER) $(_gir_silent_scanner_opts) \
171- $(INTROSPECTION_SCANNER_ARGS) \
172- --namespace=$(_gir_namespace) \
173- --nsversion=$(_gir_version) \
174- $(_gir_libtool) \
175- $(_gir_packages) \
176- $(_gir_includes) \
177- $(_gir_export_packages) \
178- $(_gir_program) \
179- $(_gir_libraries) \
180- $($(_gir_name)_SCANNERFLAGS) \
181- $($(_gir_name)_CFLAGS) \
182- $($(_gir_name)_LDFLAGS) \
183- $$^ \
184- --output $(1)
185-endef
186-
187-$(foreach gir,$(INTROSPECTION_GIRS),$(eval $(call introspection-scanner,$(gir))))
188-
189-#
190-# Compiles a gir into a typelib
191-# $(1): gir filename (input)
192-# $(2): typelib filename (output)
193-#
194-define introspection-compiler
195-$(_gir_silent_compiler) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. $(1) -o $(2)
196-endef
197-
198-# Simple rule to compile a typelib.
199-%.typelib: %.gir
200- $(call introspection-compiler,$<,$@)
201diff --git a/introspection.m4 b/introspection.m4
202deleted file mode 100644
203index d89c3d9..0000000
204--- a/introspection.m4
205+++ /dev/null
206@@ -1,96 +0,0 @@
207-dnl -*- mode: autoconf -*-
208-dnl Copyright 2009 Johan Dahlin
209-dnl
210-dnl This file is free software; the author(s) gives unlimited
211-dnl permission to copy and/or distribute it, with or without
212-dnl modifications, as long as this notice is preserved.
213-dnl
214-
215-# serial 1
216-
217-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
218-[
219- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
220- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
221- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
222-
223- dnl enable/disable introspection
224- m4_if([$2], [require],
225- [dnl
226- enable_introspection=yes
227- ],[dnl
228- AC_ARG_ENABLE(introspection,
229- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
230- [Enable introspection for this build]),,
231- [enable_introspection=auto])
232- ])dnl
233-
234- AC_MSG_CHECKING([for gobject-introspection])
235-
236- dnl presence/version checking
237- AS_CASE([$enable_introspection],
238- [no], [dnl
239- found_introspection="no (disabled, use --enable-introspection to enable)"
240- ],dnl
241- [yes],[dnl
242- PKG_CHECK_EXISTS([gobject-introspection-1.0],,
243- AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
244- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
245- found_introspection=yes,
246- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
247- ],dnl
248- [auto],[dnl
249- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
250- dnl Canonicalize enable_introspection
251- enable_introspection=$found_introspection
252- ],dnl
253- [dnl
254- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
255- ])dnl
256-
257- AC_MSG_RESULT([$found_introspection])
258-
259- INTROSPECTION_SCANNER=
260- INTROSPECTION_COMPILER=
261- INTROSPECTION_GENERATE=
262- INTROSPECTION_GIRDIR=
263- INTROSPECTION_TYPELIBDIR=
264- if test "x$found_introspection" = "xyes"; then
265- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
266- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
267- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
268- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
269- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
270- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
271- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
272- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
273- fi
274- AC_SUBST(INTROSPECTION_SCANNER)
275- AC_SUBST(INTROSPECTION_COMPILER)
276- AC_SUBST(INTROSPECTION_GENERATE)
277- AC_SUBST(INTROSPECTION_GIRDIR)
278- AC_SUBST(INTROSPECTION_TYPELIBDIR)
279- AC_SUBST(INTROSPECTION_CFLAGS)
280- AC_SUBST(INTROSPECTION_LIBS)
281- AC_SUBST(INTROSPECTION_MAKEFILE)
282-
283- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
284-])
285-
286-
287-dnl Usage:
288-dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
289-
290-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
291-[
292- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
293-])
294-
295-dnl Usage:
296-dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
297-
298-
299-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
300-[
301- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
302-])
303--
3042.1.4
305
diff --git a/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb b/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
index 41f4aee22d..84e49c13a6 100644
--- a/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
+++ b/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
@@ -4,12 +4,14 @@ SECTION = "x11/base"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6
7PROVIDES = "gtk-doc gobject-introspection-stub" 7PROVIDES = "gtk-doc"
8 8
9SRCREV = "1dea266593edb766d6d898c79451ef193eb17cfa" 9SRCREV = "1dea266593edb766d6d898c79451ef193eb17cfa"
10PV = "1.1+git${SRCPV}" 10PV = "1.1+git${SRCPV}"
11 11
12SRC_URI = "git://git.gnome.org/${BPN}" 12SRC_URI = "git://git.gnome.org/${BPN} \
13 file://0001-Revert-Import-introspection-stub-machinery-too.patch \
14 "
13 15
14S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
15 17