diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 10:38:38 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 10:39:21 +0200 |
commit | 04778c4f78d62cdd63f8aa87de52f317b2c0fd03 (patch) | |
tree | 50c45264c99958aba4172444f11e89eab7d37db4 /patches | |
parent | 5b68053005aed6ffe70bd431d740b40a319231d3 (diff) | |
download | ptxdist-04778c4f78d62cdd63f8aa87de52f317b2c0fd03.tar.gz ptxdist-04778c4f78d62cdd63f8aa87de52f317b2c0fd03.tar.xz |
gobject-introspection: version bump 1.46.0 -> 1.48.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/gobject-introspection-1.46.0/0001-giscanner-add-use-binary-wrapper-option.patch | 47 | ||||
-rw-r--r-- | patches/gobject-introspection-1.46.0/0002-giscanner-add-a-use-ldd-wrapper-option.patch | 43 | ||||
-rw-r--r-- | patches/gobject-introspection-1.46.0/0003-configure.ac-add-host-gi-and-gi-cross-wrapper-option.patch | 76 | ||||
-rw-r--r-- | patches/gobject-introspection-1.46.0/series | 8 | ||||
-rw-r--r-- | patches/gobject-introspection-1.48.0/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch (renamed from patches/gobject-introspection-1.46.0/0004-avoid-Python2-dependency.patch) | 66 | ||||
-rw-r--r-- | patches/gobject-introspection-1.48.0/0002-fix-env-shebang.patch (renamed from patches/gobject-introspection-1.46.0/0005-fix-env-shebang.patch) | 2 | ||||
l--------- | patches/gobject-introspection-1.48.0/autogen.sh (renamed from patches/gobject-introspection-1.46.0/autogen.sh) | 0 | ||||
-rw-r--r-- | patches/gobject-introspection-1.48.0/series | 5 |
8 files changed, 55 insertions, 192 deletions
diff --git a/patches/gobject-introspection-1.46.0/0001-giscanner-add-use-binary-wrapper-option.patch b/patches/gobject-introspection-1.46.0/0001-giscanner-add-use-binary-wrapper-option.patch deleted file mode 100644 index 320f976cd..000000000 --- a/patches/gobject-introspection-1.46.0/0001-giscanner-add-use-binary-wrapper-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 19 Oct 2015 18:26:40 +0300 -Subject: [PATCH] giscanner: add --use-binary-wrapper option - -With this option, giscanner will use a wrapper executable to run -binaries it's producing, instead of running them directly. This -is useful when binaries are cross-compiled and cannot be run directly, -but they can be run using for example QEMU emulation. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - giscanner/scannermain.py | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 89ec193775c4..2cae03764800 100755 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -118,6 +118,9 @@ def _get_option_parser(): - parser.add_option("", "--program", - action="store", dest="program", default=None, - help="program to execute") -+ parser.add_option("", "--use-binary-wrapper", -+ action="store", dest="wrapper", default=None, -+ help="wrapper to use for running programs (useful when cross-compiling)") - parser.add_option("", "--program-arg", - action="append", dest="program_args", default=[], - help="extra arguments to program") -@@ -412,6 +415,17 @@ def create_binary(transformer, options, args): - gdump_parser.get_error_quark_functions()) - - shlibs = resolve_shlibs(options, binary, options.libraries) -+ if options.wrapper: -+ # The wrapper needs the binary itself, not the libtool wrapper script, -+ # so we check if libtool has sneaked the binary into .libs subdirectory -+ # and adjust the path accordingly -+ import os.path -+ dir_name, binary_name = os.path.split(binary.args[0]) -+ libtool_binary = os.path.join(dir_name, '.libs', binary_name) -+ if os.path.exists(libtool_binary): -+ binary.args[0] = libtool_binary -+ # Then prepend the wrapper to the command line to execute -+ binary.args = [options.wrapper] + binary.args - gdump_parser.set_introspection_binary(binary) - gdump_parser.parse() - return shlibs diff --git a/patches/gobject-introspection-1.46.0/0002-giscanner-add-a-use-ldd-wrapper-option.patch b/patches/gobject-introspection-1.46.0/0002-giscanner-add-a-use-ldd-wrapper-option.patch deleted file mode 100644 index a5e140c97..000000000 --- a/patches/gobject-introspection-1.46.0/0002-giscanner-add-a-use-ldd-wrapper-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 30 Oct 2015 16:28:46 +0200 -Subject: [PATCH] giscanner: add a --use-ldd-wrapper option - -This is useful in cross-compile environments where system's ldd -command does not work on binaries built for a different architecture - -Upstream-Status: Pending [review in oe-core] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - giscanner/scannermain.py | 3 +++ - giscanner/shlibs.py | 4 +++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 2cae03764800..5afcc2895697 100755 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -121,6 +121,9 @@ def _get_option_parser(): - parser.add_option("", "--use-binary-wrapper", - action="store", dest="wrapper", default=None, - help="wrapper to use for running programs (useful when cross-compiling)") -+ parser.add_option("", "--use-ldd-wrapper", -+ action="store", dest="ldd_wrapper", default=None, -+ help="wrapper to use instead of ldd (useful when cross-compiling)") - parser.add_option("", "--program-arg", - action="append", dest="program_args", default=[], - help="extra arguments to program") -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 838d34303d90..87a59a90fcb9 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -100,7 +100,9 @@ def _resolve_non_libtool(options, binary, libraries): - args.extend(libtool) - args.append('--mode=execute') - platform_system = platform.system() -- if platform_system == 'Darwin': -+ if options.ldd_wrapper: -+ args.extend([options.ldd_wrapper, binary.args[0]]) -+ elif platform_system == 'Darwin': - args.extend(['otool', '-L', binary.args[0]]) - else: - args.extend(['ldd', binary.args[0]]) diff --git a/patches/gobject-introspection-1.46.0/0003-configure.ac-add-host-gi-and-gi-cross-wrapper-option.patch b/patches/gobject-introspection-1.46.0/0003-configure.ac-add-host-gi-and-gi-cross-wrapper-option.patch deleted file mode 100644 index ae340338f..000000000 --- a/patches/gobject-introspection-1.46.0/0003-configure.ac-add-host-gi-and-gi-cross-wrapper-option.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Mon, 28 Dec 2015 11:42:16 +0100 -Subject: [PATCH] configure.ac: add host-gi and gi-cross-wrapper options - -Based on a patch from Alexander Kanavin <alex.kanavin@gmail.com> - -Note: Not for upstream. It depends on PTXdist modifying the configure script. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - common.mk | 12 +++++++++++- - configure.ac | 14 ++++++++++++++ - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/common.mk b/common.mk -index e26c6377838a..2a6774cc2156 100644 ---- a/common.mk -+++ b/common.mk -@@ -6,6 +6,15 @@ - # module itself. - # - -+if USE_HOST_GI -+INTROSPECTION_SCANNER = \ -+ env PATH="$(PATH)" \ -+ LPATH=.libs \ -+ CC="$(CC)" \ -+ PYTHONPATH=$(top_builddir):$(top_srcdir) \ -+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ -+ g-ir-scanner -+else - INTROSPECTION_SCANNER = \ - env PATH=".libs:$(PATH)" \ - LPATH=.libs \ -@@ -14,6 +23,7 @@ INTROSPECTION_SCANNER = \ - UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ - UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ - $(top_builddir)/g-ir-scanner -+endif - - INTROSPECTION_SCANNER_ARGS = \ - --verbose \ -@@ -26,7 +36,7 @@ INTROSPECTION_SCANNER_ARGS = \ - - INTROSPECTION_COMPILER = \ - env PATH=".libs:$(PATH)" \ -- $(top_builddir)/g-ir-compiler$(EXEEXT) -+ $(GI_CROSS_WRAPPER) $(top_builddir)/g-ir-compiler$(EXEEXT) - - INTROSPECTION_COMPILER_ARGS = \ - --includedir=$(srcdir) \ -diff --git a/configure.ac b/configure.ac -index b11596be573c..a7b78715cdf3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -250,6 +250,20 @@ AC_FUNC_STRTOD - AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull]) - AC_CHECK_FUNCS([backtrace backtrace_symbols]) - -+AC_ARG_ENABLE([gi-cross-wrapper], -+[AS_HELP_STRING([--enable-gi-cross-wrapper=path],[Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)])], -+[GI_CROSS_WRAPPER="${enableval}"], [GI_CROSS_WRAPPER=]) -+AC_SUBST(GI_CROSS_WRAPPER) -+ -+AC_ARG_ENABLE([host-gi], -+[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])], -+[case "${enableval}" in -+ yes) host_gi=true ;; -+ no) host_gi=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-host-gi]) ;; -+esac],[host_gi=false]) -+AM_CONDITIONAL([USE_HOST_GI], [test x$host_gi = xtrue]) -+ - # Python - AM_PATH_PYTHON([2.7]) - case "$host" in diff --git a/patches/gobject-introspection-1.46.0/series b/patches/gobject-introspection-1.46.0/series deleted file mode 100644 index aaeb47861..000000000 --- a/patches/gobject-introspection-1.46.0/series +++ /dev/null @@ -1,8 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-giscanner-add-use-binary-wrapper-option.patch -0002-giscanner-add-a-use-ldd-wrapper-option.patch -0003-configure.ac-add-host-gi-and-gi-cross-wrapper-option.patch -0004-avoid-Python2-dependency.patch -0005-fix-env-shebang.patch -# 8d3fd65c073b2de3dc240a42878cef80 - git-ptx-patches magic diff --git a/patches/gobject-introspection-1.46.0/0004-avoid-Python2-dependency.patch b/patches/gobject-introspection-1.48.0/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch index 106021a51..3dc227b4a 100644 --- a/patches/gobject-introspection-1.46.0/0004-avoid-Python2-dependency.patch +++ b/patches/gobject-introspection-1.48.0/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch @@ -1,17 +1,20 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sun, 27 Dec 2015 17:15:09 +0100 -Subject: [PATCH] avoid Python2 dependency +Date: Mon, 28 Dec 2015 11:42:16 +0100 +Subject: [PATCH] don't build g-ir-scanner when cross-compiling + +Note: Not for upstream. It depends on host-gobject-introspection. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - Makefile-gir.am | 5 ++++- - Makefile-tools.am | 4 ++++ - Makefile.am | 2 ++ - configure.ac | 2 ++ - 4 files changed, 12 insertions(+), 1 deletion(-) + Makefile-gir.am | 5 ++++- + Makefile-tools.am | 4 ++++ + Makefile.am | 2 ++ + common.mk | 10 ++++++++++ + configure.ac | 3 +++ + 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Makefile-gir.am b/Makefile-gir.am -index 9aca664290c8..d605c8ee7ffa 100644 +index a09260a9767c..591ab61e0104 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -87,7 +87,10 @@ endif @@ -58,7 +61,7 @@ index dbd264c31df4..840530ee8db1 100644 g_ir_compiler_SOURCES = tools/compiler.c g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \ diff --git a/Makefile.am b/Makefile.am -index 437c673ffc3c..ca76f352bfdb 100644 +index b080a891bc5c..3d08b7f2bdd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,9 @@ include Makefile.introspection @@ -71,19 +74,48 @@ index 437c673ffc3c..ca76f352bfdb 100644 include Makefile-examples.am include Makefile-gir.am include Makefile-tools.am +diff --git a/common.mk b/common.mk +index b778f7aaf955..70872cd3d53d 100644 +--- a/common.mk ++++ b/common.mk +@@ -6,6 +6,15 @@ + # module itself. + # + ++if USE_HOST_GI ++INTROSPECTION_SCANNER = \ ++ env PATH="$(PATH)" \ ++ LPATH=.libs \ ++ CC="$(CC)" \ ++ PYTHONPATH=$(top_builddir):$(top_srcdir) \ ++ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ ++ g-ir-scanner ++else + INTROSPECTION_SCANNER = \ + env PATH=".libs:$(PATH)" \ + LPATH=.libs \ +@@ -14,6 +23,7 @@ INTROSPECTION_SCANNER = \ + UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ + UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ + $(top_builddir)/g-ir-scanner ++endif + + INTROSPECTION_SCANNER_ARGS = \ + --verbose \ diff --git a/configure.ac b/configure.ac -index a7b78715cdf3..b3d2767ccf07 100644 +index 6c91fa555b5e..8a9215023148 100644 --- a/configure.ac +++ b/configure.ac -@@ -264,6 +264,7 @@ AC_ARG_ENABLE([host-gi], - esac],[host_gi=false]) - AM_CONDITIONAL([USE_HOST_GI], [test x$host_gi = xtrue]) +@@ -250,6 +250,8 @@ AC_FUNC_STRTOD + AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull]) + AC_CHECK_FUNCS([backtrace backtrace_symbols]) -+AS_IF([ test x$host_gi != xtrue], [ ++AM_CONDITIONAL([USE_HOST_GI], [test "$cross_compiling" = yes]) ++AS_IF([test "$cross_compiling" != yes], [ # Python - AM_PATH_PYTHON([2.7]) - case "$host" in -@@ -277,6 +278,7 @@ AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found])) + # option to specify python interpreter to use; this just sets $PYTHON, so that + # we will fallback to reading $PYTHON if --with-python is not given, and +@@ -276,6 +278,7 @@ AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found])) if test "x$os_win32" = "xyes"; then AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.])) fi diff --git a/patches/gobject-introspection-1.46.0/0005-fix-env-shebang.patch b/patches/gobject-introspection-1.48.0/0002-fix-env-shebang.patch index 0ef3084c5..db4b8d1e0 100644 --- a/patches/gobject-introspection-1.46.0/0005-fix-env-shebang.patch +++ b/patches/gobject-introspection-1.48.0/0002-fix-env-shebang.patch @@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/offsets/gen-gitestoffsets b/tests/offsets/gen-gitestoffsets -index 77351060cd5b..5bf5f562e7d2 100755 +index 94a2062d3d2c..9a8d19f47426 100755 --- a/tests/offsets/gen-gitestoffsets +++ b/tests/offsets/gen-gitestoffsets @@ -1,4 +1,4 @@ diff --git a/patches/gobject-introspection-1.46.0/autogen.sh b/patches/gobject-introspection-1.48.0/autogen.sh index 9f8a4cb7d..9f8a4cb7d 120000 --- a/patches/gobject-introspection-1.46.0/autogen.sh +++ b/patches/gobject-introspection-1.48.0/autogen.sh diff --git a/patches/gobject-introspection-1.48.0/series b/patches/gobject-introspection-1.48.0/series new file mode 100644 index 000000000..f74bb2a25 --- /dev/null +++ b/patches/gobject-introspection-1.48.0/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-don-t-build-g-ir-scanner-when-cross-compiling.patch +0002-fix-env-shebang.patch +# 2159825798ed7af701a7d35c66caa0c2 - git-ptx-patches magic |