From 4b156603c4927c89336d2929efc882cd0d184b68 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 10:57:06 +0200 Subject: [PATCH 01/23] wget: fix doc and configure requirements --- ...01-Fix-itemx-issue-when-building-doc.patch | 56 +++++++++++++++++++ .../0001-Fix-the-check-for-lex-program.patch | 35 ++++++++++++ recipes/wget/wget_1.13.4.oe | 2 + 3 files changed, 93 insertions(+) create mode 100644 recipes/wget/wget-1.13.4/0001-Fix-itemx-issue-when-building-doc.patch create mode 100644 recipes/wget/wget-1.13.4/0001-Fix-the-check-for-lex-program.patch diff --git a/recipes/wget/wget-1.13.4/0001-Fix-itemx-issue-when-building-doc.patch b/recipes/wget/wget-1.13.4/0001-Fix-itemx-issue-when-building-doc.patch new file mode 100644 index 000000000..dfeeb5b84 --- /dev/null +++ b/recipes/wget/wget-1.13.4/0001-Fix-itemx-issue-when-building-doc.patch @@ -0,0 +1,56 @@ +From a2a34ad8e09117041761fa96830f289aa6e67042 Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Fri, 22 Feb 2013 12:29:37 +0100 +Subject: [PATCH] Fix @itemx issue when building doc + +@itemx should be used ONLY for second and subsequent item(s). + +Signed-off-by: Tomas Hozza +--- + doc/wget.texi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/wget.texi b/doc/wget.texi +index c1fc82f..3768156 100644 +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -876,7 +876,7 @@ recommendation to block many unrelated users from a web site due to the + actions of one. + + @cindex proxy +-@itemx --no-proxy ++@item --no-proxy + Don't use proxies, even if the appropriate @code{*_proxy} environment + variable is defined. + +@@ -977,7 +977,7 @@ are outside the range of @sc{ascii} characters (that is, greater than + whose encoding does not match the one used locally. + + @cindex IPv6 +-@itemx -4 ++@item -4 + @itemx --inet4-only + @itemx -6 + @itemx --inet6-only +@@ -3094,7 +3094,7 @@ display properly---the same as @samp{-p}. + Change setting of passive @sc{ftp}, equivalent to the + @samp{--passive-ftp} option. + +-@itemx password = @var{string} ++@item password = @var{string} + Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. + This command can be overridden using the @samp{ftp_password} and + @samp{http_password} command for @sc{ftp} and @sc{http} respectively. +@@ -3605,7 +3605,7 @@ In addition to the environment variables, proxy location and settings + may be specified from within Wget itself. + + @table @samp +-@itemx --no-proxy ++@item --no-proxy + @itemx proxy = on/off + This option and the corresponding command may be used to suppress the + use of proxy, even if the appropriate environment variables are set. +-- +1.8.1.2 + + diff --git a/recipes/wget/wget-1.13.4/0001-Fix-the-check-for-lex-program.patch b/recipes/wget/wget-1.13.4/0001-Fix-the-check-for-lex-program.patch new file mode 100644 index 000000000..58ae195e1 --- /dev/null +++ b/recipes/wget/wget-1.13.4/0001-Fix-the-check-for-lex-program.patch @@ -0,0 +1,35 @@ +From 9102bcf74c6b3e1cd02aac2c4b1dd9c14f7e1d07 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Mon, 23 Dec 2013 19:57:56 +0800 +Subject: [PATCH] Fix the check for lex program. + +Flex is required for processing src/css.l. AC_PROG_LEX defaults to +`lex` or `:' when `flex' cannot be found. + +Signed-off-by: Yousong Zhou +--- + configure.ac | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b24588f..0a9ec59 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -112,7 +112,13 @@ AM_GNU_GETTEXT_VERSION([0.17]) + + AC_PROG_RANLIB + +-AC_PROG_LEX ++dnl ++dnl Flex ++dnl ++AC_CHECK_PROGS([LEX], [flex], [:]) ++if test "$LEX" = :; then ++ AC_MSG_ERROR([No available flex program was found.]) ++fi + + dnl Turn on optimization by default. Specifically: + dnl +-- +1.7.2.5 + diff --git a/recipes/wget/wget_1.13.4.oe b/recipes/wget/wget_1.13.4.oe index f7bcbd356..b7119616d 100644 --- a/recipes/wget/wget_1.13.4.oe +++ b/recipes/wget/wget_1.13.4.oe @@ -3,3 +3,5 @@ require wget.inc COMPATIBLE_HOST_ARCHS = ".*linux .*darwin" SRC_URI += "file://remove-gets.patch" +SRC_URI += "file://0001-Fix-the-check-for-lex-program.patch" +SRC_URI += "file://0001-Fix-itemx-issue-when-building-doc.patch" From a07f764d54157a13c897a8cf325beafb1ccac497 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 10:57:33 +0200 Subject: [PATCH 02/23] wget: need flex --- recipes/wget/wget.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wget/wget.inc b/recipes/wget/wget.inc index de62f46ce..a2fe37195 100644 --- a/recipes/wget/wget.inc +++ b/recipes/wget/wget.inc @@ -5,7 +5,7 @@ RECIPE_TYPES = "machine native" DEPENDS_LIBC = "librt" DEPENDS_LIBC:HOST_LIBC_mingw = "" -DEPENDS = "${DEPENDS_LIBC}" +DEPENDS = "${DEPENDS_LIBC} native:flex" inherit autotools gettext From e34d1ce7d20fa878875f7b7afc91f0ffbb579289 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:00:21 +0200 Subject: [PATCH 03/23] pth: patch pth-config in order to pass correcly with binconfig class --- recipes/pth/files/pth-config-vars.patch | 85 +++++++++++++++++++++++++ recipes/pth/pth.inc | 4 +- recipes/pth/pth_2.0.7.oe | 10 ++- 3 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 recipes/pth/files/pth-config-vars.patch diff --git a/recipes/pth/files/pth-config-vars.patch b/recipes/pth/files/pth-config-vars.patch new file mode 100644 index 000000000..023391146 --- /dev/null +++ b/recipes/pth/files/pth-config-vars.patch @@ -0,0 +1,85 @@ +diff -urN a/pth-config.in b/pth-config.in +--- a/pth-config.in 2006-06-08 19:54:02.000000000 +0200 ++++ b/pth-config.in 2015-05-21 20:54:16.274300723 +0200 +@@ -30,17 +30,16 @@ + prefix="@prefix@" + exec_prefix="@exec_prefix@" + +-pth_prefix="$prefix" +-pth_exec_prefix="$exec_prefix" +-pth_bindir="@bindir@" +-pth_libdir="@libdir@" +-pth_includedir="@includedir@" +-pth_mandir="@mandir@" +-pth_datadir="@datadir@" +-pth_acdir="@datadir@/aclocal" +-pth_cflags="@CFLAGS@" +-pth_ldflags="@LDFLAGS@" +-pth_libs="@LIBS@" ++exec_prefix="$exec_prefix" ++bindir="@bindir@" ++libdir="@libdir@" ++includedir="@includedir@" ++mandir="@mandir@" ++datadir="@datadir@" ++acdir="@datadir@/aclocal" ++cflags="@CFLAGS@" ++ldflags="@LDFLAGS@" ++libs="@LIBS@" + pth_version="@PTH_VERSION_STR@" + + help=no +@@ -85,40 +84,40 @@ + all=yes + ;; + --prefix) +- output="$output $pth_prefix" ++ output="$output $prefix" + ;; + --exec-prefix) +- output="$output $pth_exec_prefix" ++ output="$output $exec_prefix" + ;; + --bindir) +- output="$output $pth_bindir" ++ output="$output $bindir" + ;; + --libdir) +- output="$output $pth_libdir" ++ output="$output $libdir" + ;; + --includedir) +- output="$output $pth_includedir" ++ output="$output $includedir" + ;; + --mandir) +- output="$output $pth_mandir" ++ output="$output $mandir" + ;; + --datadir) +- output="$output $pth_datadir" ++ output="$output $datadir" + ;; + --acdir) +- output="$output $pth_acdir" ++ output="$output $acdir" + ;; + --cflags) +- output="$output -I$pth_includedir" +- output_extra="$output_extra $pth_cflags" ++ output="$output -I$includedir" ++ output_extra="$output_extra $cflags" + ;; + --ldflags) +- output="$output -L$pth_libdir" +- output_extra="$output_extra $pth_ldflags" ++ output="$output -L$libdir" ++ output_extra="$output_extra $ldflags" + ;; + --libs) + output="$output -lpth" +- output_extra="$output_extra $pth_libs" ++ output_extra="$output_extra $libs" + ;; + * ) + echo "pth-config:Error: Invalid option" 1>&2 diff --git a/recipes/pth/pth.inc b/recipes/pth/pth.inc index 7c6dec04b..0a75f808f 100644 --- a/recipes/pth/pth.inc +++ b/recipes/pth/pth.inc @@ -4,12 +4,12 @@ LICENSE = "GPLv2+" COMPATIBLE_HOST_ARCHS = ".*linux" +RECIPE_TYPES = "machine native" + inherit autotools pkgconfig library auto-package-utils binconfig require conf/fetch/gnu.conf SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz" -SRC_URI += "file://fix_for_3x_kernels.patch" -SRC_URI += "file://pth-add-pkgconfig-support.patch" PARALLEL_MAKE = "" diff --git a/recipes/pth/pth_2.0.7.oe b/recipes/pth/pth_2.0.7.oe index a54a7b533..60de50e51 100644 --- a/recipes/pth/pth_2.0.7.oe +++ b/recipes/pth/pth_2.0.7.oe @@ -1,9 +1,7 @@ require pth.inc -LIBRARY_VERSION = "20" +SRC_URI += "file://fix_for_3x_kernels.patch" +SRC_URI += "file://pth-add-pkgconfig-support.patch" +SRC_URI += " file://pth-config-vars.patch" -do_install[postfuncs] += "do_install_fix_path_error" -do_install_fix_path_error() { - sed -i -e 's#\(.*output=\"\$output\)\( -I\$pth_includedir\"\)#\1\"#' \ - ${D}${bindir}/pth-config -} +LIBRARY_VERSION = "20" From 4c54f8f06fb8f7163a1da0ff1e0d2b9c836cc283 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:05:40 +0200 Subject: [PATCH 04/23] strongswan: add systemd file --- recipes/strongswan/strongswan.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/strongswan/strongswan.inc b/recipes/strongswan/strongswan.inc index 9a5c50500..dedbafacc 100644 --- a/recipes/strongswan/strongswan.inc +++ b/recipes/strongswan/strongswan.inc @@ -22,6 +22,7 @@ FILES_${PN}-dev += "${libdir}/ipsec/*.a \ FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libdir}/ipsec/plugins/.debug \ ${libexecdir}/ipsec/.debug" FILES_${PN} += "${libdir}/ipsec" +FILES_${PN} += "${libdir}/systemd" DEPENDS_${PN} += "libc libdl libm libpthread librt libgmp libcrypto" DEPENDS_${PN}[qa] += "allow-missing-lib-depends" RDEPENDS_${PN} = "libc libdl libm libpthread librt libgmcp libcrypto" From 07ccd759d83662cf27f93dbbce7c4fd30c1d0d98 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:06:47 +0200 Subject: [PATCH 05/23] sysstat: use autoreconf and add gettext dependency --- recipes/sysstat/sysstat.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/sysstat/sysstat.inc b/recipes/sysstat/sysstat.inc index 05d093200..a6e1d806f 100644 --- a/recipes/sysstat/sysstat.inc +++ b/recipes/sysstat/sysstat.inc @@ -6,7 +6,7 @@ COMPATIBLE_HOST_ARCHS = ".*linux" SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.bz2" -inherit autotools +inherit autotools-autoreconf gettext EXTRA_OECONF += "--disable-documentation" From e77da5b9a33d3b76b155d6db088fc9ba83dd05cf Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:12:00 +0200 Subject: [PATCH 06/23] m4: add recipe --- recipes/m4/m4.inc | 8 ++++++++ recipes/m4/m4_1.4.17.oe | 1 + recipes/m4/m4_1.4.17.oe.sig | 1 + 3 files changed, 10 insertions(+) create mode 100644 recipes/m4/m4.inc create mode 100644 recipes/m4/m4_1.4.17.oe create mode 100644 recipes/m4/m4_1.4.17.oe.sig diff --git a/recipes/m4/m4.inc b/recipes/m4/m4.inc new file mode 100644 index 000000000..a9797c6bc --- /dev/null +++ b/recipes/m4/m4.inc @@ -0,0 +1,8 @@ +# -*- mode:python; -*- +RECIPE_TYPES = "machine native" + +inherit autotools + +require conf/fetch/gnu.conf +SRC_URI += "${GNU_MIRROR}/${PN}/${PN}-${PV}.tar.xz" + diff --git a/recipes/m4/m4_1.4.17.oe b/recipes/m4/m4_1.4.17.oe new file mode 100644 index 000000000..bd5441968 --- /dev/null +++ b/recipes/m4/m4_1.4.17.oe @@ -0,0 +1 @@ +require ${PN}.inc diff --git a/recipes/m4/m4_1.4.17.oe.sig b/recipes/m4/m4_1.4.17.oe.sig new file mode 100644 index 000000000..b9f80c13a --- /dev/null +++ b/recipes/m4/m4_1.4.17.oe.sig @@ -0,0 +1 @@ +74ad71fa100ec8c13bc715082757eb9ab1e4bbb0 m4-1.4.17.tar.xz From b82ba0fa48d0b021baebe01339adaddb8f3440ab Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:12:47 +0200 Subject: [PATCH 07/23] flex: add recipe --- .../flex-2.5.39/do_not_create_pdf_doc.patch | 17 +++++++++++++++++ recipes/flex/flex.inc | 12 ++++++++++++ recipes/flex/flex_2.5.39.oe | 3 +++ recipes/flex/flex_2.5.39.oe.sig | 1 + 4 files changed, 33 insertions(+) create mode 100644 recipes/flex/flex-2.5.39/do_not_create_pdf_doc.patch create mode 100644 recipes/flex/flex.inc create mode 100644 recipes/flex/flex_2.5.39.oe create mode 100644 recipes/flex/flex_2.5.39.oe.sig diff --git a/recipes/flex/flex-2.5.39/do_not_create_pdf_doc.patch b/recipes/flex/flex-2.5.39/do_not_create_pdf_doc.patch new file mode 100644 index 000000000..02ececb0b --- /dev/null +++ b/recipes/flex/flex-2.5.39/do_not_create_pdf_doc.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inapropriate (embedded specific) + +Signed-off-by: Laurentiu Palcu + +Index: flex-2.5.37/doc/Makefile.am +=================================================================== +--- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300 ++++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300 +@@ -2,7 +2,7 @@ + + info_TEXINFOS = flex.texi + dist_man_MANS = flex.1 +-dist_doc_DATA= flex.pdf ++EXTRA_DIST= flex.pdf + + CLEANFILES = \ + flex.hks \ diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc new file mode 100644 index 000000000..d425e3bdf --- /dev/null +++ b/recipes/flex/flex.inc @@ -0,0 +1,12 @@ +# -*- mode:python; -*- +RECIPE_TYPES = "machine native" + +inherit autotools-autoreconf gettext + +DEPENDS += "native:texinfo" + +require conf/fetch/sourceforge.conf +SRC_URI += "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.xz" + +DEPENDS_${PN} += "libintl" +RDEPENDS_${PN} += "libintl" diff --git a/recipes/flex/flex_2.5.39.oe b/recipes/flex/flex_2.5.39.oe new file mode 100644 index 000000000..47d203ad0 --- /dev/null +++ b/recipes/flex/flex_2.5.39.oe @@ -0,0 +1,3 @@ +require ${PN}.inc + +SRC_URI += "file://do_not_create_pdf_doc.patch" diff --git a/recipes/flex/flex_2.5.39.oe.sig b/recipes/flex/flex_2.5.39.oe.sig new file mode 100644 index 000000000..41fa1a69e --- /dev/null +++ b/recipes/flex/flex_2.5.39.oe.sig @@ -0,0 +1 @@ +415e82bb0dc9b1713fc4802a9db2274cd8d2909a flex-2.5.39.tar.xz From f8396b73e65ad0b85e63f5cc86f7ec8c3cb4ecb3 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:13:53 +0200 Subject: [PATCH 08/23] bison: add recipe --- recipes/bison/bison-3.0.4/m4.patch | 27 +++++++++++++++++++++++++++ recipes/bison/bison.inc | 14 ++++++++++++++ recipes/bison/bison/bin/bison | 3 +++ recipes/bison/bison_3.0.4.oe | 3 +++ recipes/bison/bison_3.0.4.oe.sig | 1 + 5 files changed, 48 insertions(+) create mode 100644 recipes/bison/bison-3.0.4/m4.patch create mode 100644 recipes/bison/bison.inc create mode 100755 recipes/bison/bison/bin/bison create mode 100644 recipes/bison/bison_3.0.4.oe create mode 100644 recipes/bison/bison_3.0.4.oe.sig diff --git a/recipes/bison/bison-3.0.4/m4.patch b/recipes/bison/bison-3.0.4/m4.patch new file mode 100644 index 000000000..bc395b78b --- /dev/null +++ b/recipes/bison/bison-3.0.4/m4.patch @@ -0,0 +1,27 @@ +diff -urN a/data/c-skel.m4 b/data/c-skel.m4 +--- a/data/c-skel.m4 2015-01-16 15:47:42.000000000 +0100 ++++ b/data/c-skel.m4 2015-05-19 11:17:37.369846890 +0200 +@@ -23,4 +23,4 @@ + m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[yacc.c]]) + m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) + +-m4_include(b4_used_skeleton) ++m4_include(b4_pkgdatadir/[yacc.c]) +diff -urN a/data/c++-skel.m4 b/data/c++-skel.m4 +--- a/data/c++-skel.m4 2015-01-16 15:47:42.000000000 +0100 ++++ b/data/c++-skel.m4 2015-05-19 11:17:48.281995788 +0200 +@@ -23,4 +23,4 @@ + m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]]) + m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) + +-m4_include(b4_used_skeleton) ++m4_include(b4_pkgdatadir/[lalr1.cc]) +diff -urN a/data/java-skel.m4 b/data/java-skel.m4 +--- a/data/java-skel.m4 2015-01-16 15:47:42.000000000 +0100 ++++ b/data/java-skel.m4 2015-05-19 11:17:19.145598194 +0200 +@@ -23,4 +23,4 @@ + m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.java]]) + m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) + +-m4_include(b4_used_skeleton) ++m4_include(b4_pkgdatadir/[lalr1.java]) diff --git a/recipes/bison/bison.inc b/recipes/bison/bison.inc new file mode 100644 index 000000000..dfbd9ab16 --- /dev/null +++ b/recipes/bison/bison.inc @@ -0,0 +1,14 @@ +# -*- mode:python; -*- +RECIPE_TYPES = "machine native" + +inherit autotools-autoreconf gettext wrapper + +DEPENDS += "native:help2man" + +require conf/fetch/gnu.conf +SRC_URI += "${GNU_MIRROR}/${PN}/${PN}-${PV}.tar.xz" +SRC_URI += "file://bin/bison;subdir=bin/" + +DEPENDS_${PN} += "libintl" +RDEPENDS_${PN} += "libintl" + diff --git a/recipes/bison/bison/bin/bison b/recipes/bison/bison/bin/bison new file mode 100755 index 000000000..39315ccc6 --- /dev/null +++ b/recipes/bison/bison/bin/bison @@ -0,0 +1,3 @@ +#!/bin/sh +export BISON_PKGDATADIR=${datadir}/bison +exec -a ${exec_prefix}${currentfile} ${exec_prefix}${realfile} $@ diff --git a/recipes/bison/bison_3.0.4.oe b/recipes/bison/bison_3.0.4.oe new file mode 100644 index 000000000..2bba28755 --- /dev/null +++ b/recipes/bison/bison_3.0.4.oe @@ -0,0 +1,3 @@ +require ${PN}.inc + +SRC_URI += "file://m4.patch" diff --git a/recipes/bison/bison_3.0.4.oe.sig b/recipes/bison/bison_3.0.4.oe.sig new file mode 100644 index 000000000..da053ce11 --- /dev/null +++ b/recipes/bison/bison_3.0.4.oe.sig @@ -0,0 +1 @@ +8270497aad88c7dd4f2c317298c50513fb0c3c8e bison-3.0.4.tar.xz From 960f2cbb5aef12ab6488d60bba18074d87184320 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:22:30 +0200 Subject: [PATCH 09/23] nettle: use autoreconf --- recipes/nettle/nettle.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/nettle/nettle.inc b/recipes/nettle/nettle.inc index 8d846a7c2..21779bf38 100644 --- a/recipes/nettle/nettle.inc +++ b/recipes/nettle/nettle.inc @@ -7,7 +7,9 @@ COMPATIBLE_HOST_ARCHS = ".*linux .*darwin" require conf/fetch/gnu.conf SRC_URI = "${GNU_MIRROR}/${PN}/${PN}-${PV}.tar.gz" -inherit c++ autotools +inherit c++ autotools-autoreconf + +EXTRA_AUTORECONF="-Iaclocal.m4" DEPENDS += "libgmp" From ceaa28a940131564b5b94459b53b4771ca93e10a Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:27:21 +0200 Subject: [PATCH 10/23] iw: use and improve fix for git repository --- recipes/iw/files/fix_version.patch | 25 ++++++++++++++++++++++--- recipes/iw/iw.inc | 1 - recipes/iw/iw_3.7.oe | 2 ++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/recipes/iw/files/fix_version.patch b/recipes/iw/files/fix_version.patch index 6c59a0b12..860076142 100644 --- a/recipes/iw/files/fix_version.patch +++ b/recipes/iw/files/fix_version.patch @@ -1,11 +1,30 @@ ---- iw-3.7/version.sh.org 2012-11-09 14:03:53.089541469 +0100 -+++ iw-3.7/version.sh 2012-11-09 14:05:19.906817310 +0100 +From 2b60b435dd032572c556b064295a3e3607d00a55 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Sun, 1 Sep 2013 17:57:21 +0200 +Subject: [PATCH] Don't get iw version from git if there is no .git/ + +The version.sh script should only try to get the version from git if the +source actually resides in a git repository, i.e. .git/ exists. Doing +otherwise in a non-git source repo results in git ascending until it +finds a .git directory, which will cause problems in some source-based +distributions ( https://bugs.gentoo.org/show_bug.cgi?id=482334 ). +--- + version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/version.sh b/version.sh +index 80e55ab..0f1aa1d 100755 +--- a/version.sh ++++ b/version.sh @@ -3,7 +3,7 @@ VERSION="3.7" OUT="$1" -if head=`git rev-parse --verify HEAD 2>/dev/null`; then -+if false; then ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then git update-index --refresh --unmerged > /dev/null descr=$(git describe) +-- +1.8.1.5 + diff --git a/recipes/iw/iw.inc b/recipes/iw/iw.inc index 3cd30c9ba..1aafeccd6 100644 --- a/recipes/iw/iw.inc +++ b/recipes/iw/iw.inc @@ -9,7 +9,6 @@ DEPENDS = "${COMMON_DEPENDS}" DEPENDS_${PN} += "${COMMON_DEPENDS}" RDEPENDS_${PN} += "${COMMON_DEPENDS}" PROVIDES_${PN} += "util/${PN}" -EXTRA_OEMAKE = "V=1" SRC_URI = "https://www.kernel.org/pub/software/network/${PN}/${PN}-${PV}.tar.gz" # git://git.sipsolutions.net/iw.git;protocol=git;${SRC_REV} diff --git a/recipes/iw/iw_3.7.oe b/recipes/iw/iw_3.7.oe index 4492cc1ae..80bc6655c 100644 --- a/recipes/iw/iw_3.7.oe +++ b/recipes/iw/iw_3.7.oe @@ -1 +1,3 @@ require iw.inc + +SRC_URI += "file://fix_version.patch" From 23051a7225e9569bcfdde559d04538cfb02455a0 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:28:37 +0200 Subject: [PATCH 11/23] rsync: use autoreconf --- recipes/rsync/rsync_3.1.0.oe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/rsync/rsync_3.1.0.oe b/recipes/rsync/rsync_3.1.0.oe index 66ca81073..25181a591 100644 --- a/recipes/rsync/rsync_3.1.0.oe +++ b/recipes/rsync/rsync_3.1.0.oe @@ -6,7 +6,9 @@ SRC_URI = "http://rsync.samba.org/ftp/rsync/src/${PN}-${PV}.tar.gz" RECIPE_TYPES = "machine" COMPATIBLE_HOST_ARCHS = ".*linux" -inherit autotools +inherit autotools-autoreconf + +EXTRA_AUTORECONF="-Iaclocal.m4" DEPENDS_${PN} = "libc libgcc" RDEPENDS_${PN} = "libc libgcc" From 5ac2a1ff3306ddecc9ef1ac34d3d80d5901ffd22 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:29:10 +0200 Subject: [PATCH 12/23] texinfo: add recipe --- .../texinfo-5.2/disable-native-tools.patch | 43 +++++++++++++++++++ .../texinfo/texinfo-5.2/help-discard.patch | 14 ++++++ .../texinfo/texinfo-5.2/install_makedoc.patch | 12 ++++++ recipes/texinfo/texinfo-5.2/m4.patch | 12 ++++++ .../texinfo-5.2/use_host_makedoc.patch | 17 ++++++++ recipes/texinfo/texinfo.inc | 15 +++++++ recipes/texinfo/texinfo_5.2.oe | 8 ++++ recipes/texinfo/texinfo_5.2.oe.sig | 1 + 8 files changed, 122 insertions(+) create mode 100644 recipes/texinfo/texinfo-5.2/disable-native-tools.patch create mode 100644 recipes/texinfo/texinfo-5.2/help-discard.patch create mode 100644 recipes/texinfo/texinfo-5.2/install_makedoc.patch create mode 100644 recipes/texinfo/texinfo-5.2/m4.patch create mode 100644 recipes/texinfo/texinfo-5.2/use_host_makedoc.patch create mode 100644 recipes/texinfo/texinfo.inc create mode 100644 recipes/texinfo/texinfo_5.2.oe create mode 100644 recipes/texinfo/texinfo_5.2.oe.sig diff --git a/recipes/texinfo/texinfo-5.2/disable-native-tools.patch b/recipes/texinfo/texinfo-5.2/disable-native-tools.patch new file mode 100644 index 000000000..ab6f1658a --- /dev/null +++ b/recipes/texinfo/texinfo-5.2/disable-native-tools.patch @@ -0,0 +1,43 @@ +We already DEPEND on the native texinfo being present before building so +there isn't any need to try and build the required native texinfo binaries +before cross-compiling. This simplifies the recipe somewhat! + +Upstream-Status: Inappropriate oe specific + +Signed-off-by: Joshua Lock + +Index: texinfo-4.13/configure.ac +=================================================================== +--- texinfo-4.13.orig/configure.ac ++++ texinfo-4.13/configure.ac +@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD + # $native_tools is also added to SUBDIRS in the main Makefile.am, + # so that make compiles the native tools first. + # +-if test "$cross_compiling" = no; then +- native_tools= +-else +- native_tools=tools +- test -d "$native_tools" || mkdir "$native_tools" +- confdir=`(cd "$srcdir";pwd)` +- # Make sure the secondary configure won't fail with +- # "error: source directory already configured". +- rm -f config.status +- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]]) +- cd "$native_tools" || exit 1 +- # Run secondary configure in alternate environment or +- # it gets the wrong CC etc. +- # env -i gives this build host configure a clean environment; +- # consequently, we have to re-initialize $PATH. +- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ +- PATH="$PATH" \ +- tools_only=1 \ +- ${confdir}/configure --build=${build} --host=${build} \ +- --disable-rpath --disable-nls +- cd .. || exit 1 +- AC_MSG_NOTICE([[Continuing with main configure (${host}).]]) +-fi ++native_tools= + AC_SUBST(native_tools) + AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) + diff --git a/recipes/texinfo/texinfo-5.2/help-discard.patch b/recipes/texinfo/texinfo-5.2/help-discard.patch new file mode 100644 index 000000000..d25677506 --- /dev/null +++ b/recipes/texinfo/texinfo-5.2/help-discard.patch @@ -0,0 +1,14 @@ +diff -urN a/man/Makefile.am b/man/Makefile.am +--- a/man/Makefile.am 2013-03-21 00:05:30.000000000 +0100 ++++ b/man/Makefile.am 2015-05-20 23:06:43.635834326 +0200 +@@ -63,8 +63,8 @@ + && $(man_rule_0) \ + && echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$$exe_ext \ + && (cd "$$dir" && $(MAKE) $(AM_MAKEFLAGS) $$program$$exe_ext) \ +- && echo $(HELP2MAN) --name=\""$$name"\" -I "$$h2m" "$$dir/$$program" -o '$@'\ +- && $(HELP2MAN) --name="$$name" -I "$$h2m" "$$dir/$$program" -o '$@' ++ && echo $(HELP2MAN) --no-discard-stderr --name=\""$$name"\" -I "$$h2m" "$$dir/$$program" -o '$@'\ ++ && $(HELP2MAN) --no-discard-stderr --name="$$name" -I "$$h2m" "$$dir/$$program" -o '$@' + + + # Using help2man depends on the package version number. diff --git a/recipes/texinfo/texinfo-5.2/install_makedoc.patch b/recipes/texinfo/texinfo-5.2/install_makedoc.patch new file mode 100644 index 000000000..82e7b828e --- /dev/null +++ b/recipes/texinfo/texinfo-5.2/install_makedoc.patch @@ -0,0 +1,12 @@ +diff -urN a/info/Makefile.am b/info/Makefile.am +--- a/info/Makefile.am 2013-04-15 23:39:09.000000000 +0200 ++++ b/info/Makefile.am 2015-05-20 19:19:05.506189932 +0200 +@@ -63,7 +63,7 @@ + # These files are not distributed. + DISTCLEANFILES = $(generated_sources) + +-noinst_PROGRAMS = makedoc ++bin_PROGRAMS += makedoc + makedoc_SOURCES = makedoc.c + + # Files with Info commands defined that makedoc should read. diff --git a/recipes/texinfo/texinfo-5.2/m4.patch b/recipes/texinfo/texinfo-5.2/m4.patch new file mode 100644 index 000000000..3a7a71093 --- /dev/null +++ b/recipes/texinfo/texinfo-5.2/m4.patch @@ -0,0 +1,12 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2013-09-27 01:04:02.000000000 +0200 ++++ b/configure.ac 2015-05-15 13:51:45.614866247 +0200 +@@ -21,6 +21,8 @@ + AM_INIT_AUTOMAKE([1.14 dist-xz + info-in-builddir parallel-tests readme-alpha tar-ustar]) + ++m4_include([gnulib/m4/argz.m4]) ++ + # Where to generate output; srcdir location. + AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS. + AC_CONFIG_SRCDIR([info/info.c]) diff --git a/recipes/texinfo/texinfo-5.2/use_host_makedoc.patch b/recipes/texinfo/texinfo-5.2/use_host_makedoc.patch new file mode 100644 index 000000000..5b7f32d9a --- /dev/null +++ b/recipes/texinfo/texinfo-5.2/use_host_makedoc.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inappropriate [cross build specific] + +Signed-off-by: Saul Wold + +Index: texinfo-5.1/info/Makefile.am +=================================================================== +--- texinfo-5.1.orig/info/Makefile.am ++++ texinfo-5.1/info/Makefile.am +@@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd + # more than once. + funs.h: makedoc$(EXEEXT) $(cmd_sources) + rm -f $(generated_sources) +- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) ++ makedoc $(cmd_sources) + + # The following hack is necessary to hint make before the automatic + # dependencies are built. diff --git a/recipes/texinfo/texinfo.inc b/recipes/texinfo/texinfo.inc new file mode 100644 index 000000000..a56a466d0 --- /dev/null +++ b/recipes/texinfo/texinfo.inc @@ -0,0 +1,15 @@ +# -*- mode:python; -*- +RECIPE_TYPES = "machine native" + +inherit autotools-autoreconf gettext + +DEPENDS += "native:help2man ${DEPENDS_NOT_NATIVE}" + +DEPENDS_NOT_NATIVE = "native:texinfo" +DEPENDS_NOT_NATIVE:native = "" + +require conf/fetch/gnu.conf +SRC_URI += "${GNU_MIRROR}/${PN}/${PN}-${PV}.tar.xz" + +PROVIDES_${PN} += "makeinfo install-info texi2dvi texi2pdf pod2texi infokey texindex texi2any info pdftexi2dvi" + diff --git a/recipes/texinfo/texinfo_5.2.oe b/recipes/texinfo/texinfo_5.2.oe new file mode 100644 index 000000000..19fc736c0 --- /dev/null +++ b/recipes/texinfo/texinfo_5.2.oe @@ -0,0 +1,8 @@ +require ${PN}.inc + +SRC_URI += "file://m4.patch" +SRC_URI += "file://disable-native-tools.patch" +SRC_URI += "file://help-discard.patch" +SRC_URI += "${SRC_URI_NATIVE}" +SRC_URI_NATIVE = "file://use_host_makedoc.patch" +SRC_URI_NATIVE:native = "file://install_makedoc.patch" diff --git a/recipes/texinfo/texinfo_5.2.oe.sig b/recipes/texinfo/texinfo_5.2.oe.sig new file mode 100644 index 000000000..5cf7db69b --- /dev/null +++ b/recipes/texinfo/texinfo_5.2.oe.sig @@ -0,0 +1 @@ +fbbc35c5857d11d1164c8445c78b66ad6d472072 texinfo-5.2.tar.xz From cae60a5a5638b6a0041ef668b4c627aacb029cc9 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:29:27 +0200 Subject: [PATCH 13/23] intltool: add recipe --- recipes/intltool/intltool.inc | 9 +++++++++ recipes/intltool/intltool_0.51.0.oe | 1 + recipes/intltool/intltool_0.51.0.oe.sig | 1 + 3 files changed, 11 insertions(+) create mode 100644 recipes/intltool/intltool.inc create mode 100644 recipes/intltool/intltool_0.51.0.oe create mode 100644 recipes/intltool/intltool_0.51.0.oe.sig diff --git a/recipes/intltool/intltool.inc b/recipes/intltool/intltool.inc new file mode 100644 index 000000000..4c580c29c --- /dev/null +++ b/recipes/intltool/intltool.inc @@ -0,0 +1,9 @@ +# -*- mode:python; -*- +RECIPE_TYPES = "machine native" + +inherit autotools-autoreconf + +SRC_URI += "https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}-${PV}.tar.gz" + +DEPENDS_${PN} += "util/xgettext util/msgmerge util/msgfmt" +RDEPENDS_${PN} += "util/xgettext util/msgmerge util/msgfmt" diff --git a/recipes/intltool/intltool_0.51.0.oe b/recipes/intltool/intltool_0.51.0.oe new file mode 100644 index 000000000..bd5441968 --- /dev/null +++ b/recipes/intltool/intltool_0.51.0.oe @@ -0,0 +1 @@ +require ${PN}.inc diff --git a/recipes/intltool/intltool_0.51.0.oe.sig b/recipes/intltool/intltool_0.51.0.oe.sig new file mode 100644 index 000000000..7acea3eb6 --- /dev/null +++ b/recipes/intltool/intltool_0.51.0.oe.sig @@ -0,0 +1 @@ +a0c3bcb99d1bcfc5db70f8d848232a47c47da090 intltool-0.51.0.tar.gz From 6169ff50bbb5637e9f4127495d10271da5abaa3e Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:33:00 +0200 Subject: [PATCH 14/23] gconf: need native intltool --- recipes/gconf/gconf_3.2.6.oe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gconf/gconf_3.2.6.oe b/recipes/gconf/gconf_3.2.6.oe index 246382cd1..657c9faf6 100644 --- a/recipes/gconf/gconf_3.2.6.oe +++ b/recipes/gconf/gconf_3.2.6.oe @@ -8,7 +8,7 @@ inherit autotools pkgconfig gettext DEPENDS = "libxml2 libm libdbus-1 libdbus-glib-1 \ libgobject libglib libgthread libgmodule libgio \ - native:glib-utils" + native:glib-utils native:intltool" S = "${SRCDIR}/GConf-${PV}" From 89ced68d371e89dd3a4d8c3f6e4da3052c912f97 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:36:04 +0200 Subject: [PATCH 15/23] util-linux: remove verbose compilation --- recipes/util-linux/util-linux.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/util-linux/util-linux.inc b/recipes/util-linux/util-linux.inc index 04a489eaf..d6f740368 100644 --- a/recipes/util-linux/util-linux.inc +++ b/recipes/util-linux/util-linux.inc @@ -45,8 +45,6 @@ EXTRA_OECONF += "${EXTRA_OECONF_LARGEFILE}" EXTRA_OECONF_LARGEFILE = " --disable-largefile" EXTRA_OECONF_LARGEFILE:USE_largefile = " --enable-largefile" -EXTRA_OEMAKE += "V=1" - # Grrrr... at least some versions of util-linux insists on having # an sbin dir even though it is told to put everything in bin. At # least it seems to respect requests on dropping usr prefix From 6b0c4e3eb654762d81718a1ead2f9edfc795fea6 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:36:21 +0200 Subject: [PATCH 16/23] busybox: remove verbose compilation --- recipes/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index fd12b00d7..1a47dc557 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -55,7 +55,7 @@ export EXTRA_LDFLAGS = "${LDFLAGS}" require busybox-configure.inc -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" +EXTRA_OEMAKE += "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" EXTRA_OEMAKE += "CROSS=${HOST_PREFIX}" do_compile() { From 77e23839bf3c3fbd51d5bb7bacc19139c9cc6059 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 12:15:02 +0200 Subject: [PATCH 17/23] pkg-config: Update to last version --- .../pkg-config/pkg-config-0.26/autofoo.patch | 528 ------------------ .../pkg-config-0.26/glibconfig-sysdefs.h | 6 - .../pkg-config-0.26-win32.patch | 101 ---- recipes/pkg-config/pkg-config.inc | 8 +- recipes/pkg-config/pkg-config_0.26.oe.sig | 1 - ...{pkg-config_0.26.oe => pkg-config_0.28.oe} | 0 recipes/pkg-config/pkg-config_0.28.oe.sig | 1 + 7 files changed, 8 insertions(+), 637 deletions(-) delete mode 100644 recipes/pkg-config/pkg-config-0.26/autofoo.patch delete mode 100644 recipes/pkg-config/pkg-config-0.26/glibconfig-sysdefs.h delete mode 100644 recipes/pkg-config/pkg-config-0.26/pkg-config-0.26-win32.patch delete mode 100644 recipes/pkg-config/pkg-config_0.26.oe.sig rename recipes/pkg-config/{pkg-config_0.26.oe => pkg-config_0.28.oe} (100%) create mode 100644 recipes/pkg-config/pkg-config_0.28.oe.sig diff --git a/recipes/pkg-config/pkg-config-0.26/autofoo.patch b/recipes/pkg-config/pkg-config-0.26/autofoo.patch deleted file mode 100644 index 9853577b5..000000000 --- a/recipes/pkg-config/pkg-config-0.26/autofoo.patch +++ /dev/null @@ -1,528 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - glib-1.2.10/acglib.m4 | 12 +- - glib-1.2.10/configure.in | 212 ++++++++++++++++++++++++++++++------------------ - 2 files changed, 140 insertions(+), 84 deletions(-) - -Index: pkg-config-0.23/glib-1.2.10/acglib.m4 -=================================================================== ---- pkg-config-0.23.orig/glib-1.2.10/acglib.m4 2008-01-16 22:52:24.000000000 +0000 -+++ pkg-config-0.23/glib-1.2.10/acglib.m4 2008-03-26 20:59:12.000000000 +0000 -@@ -10,7 +10,7 @@ - AC_DIVERT_POP()])])]) - - dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION]) --AC_DEFUN(GLIB_IF_VAR_EQ,[ -+AC_DEFUN([GLIB_IF_VAR_EQ],[ - case "$[$1]" in - "[$2]"[)] - [$3] -@@ -21,7 +21,7 @@ - esac - ]) - dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION]) --AC_DEFUN(GLIB_STR_CONTAINS,[ -+AC_DEFUN([GLIB_STR_CONTAINS],[ - case "[$1]" in - *"[$2]"*[)] - [$3] -@@ -32,12 +32,12 @@ - esac - ]) - dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING) --AC_DEFUN(GLIB_ADD_TO_VAR,[ -+AC_DEFUN([GLIB_ADD_TO_VAR],[ - GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]") - ]) - - dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE]) --AC_DEFUN(GLIB_SIZEOF, -+AC_DEFUN([GLIB_SIZEOF], - [changequote(<<, >>)dnl - dnl The name to #define. - define(<>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl -@@ -62,7 +62,7 @@ - ]) - - dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER) --AC_DEFUN(GLIB_BYTE_CONTENTS, -+AC_DEFUN([GLIB_BYTE_CONTENTS], - [changequote(<<, >>)dnl - dnl The name to #define. - define(<>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl -@@ -92,7 +92,7 @@ - ]) - - dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX]) --AC_DEFUN(GLIB_SYSDEFS, -+AC_DEFUN([GLIB_SYSDEFS], - [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])" - glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'` - if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then -Index: pkg-config-0.23/glib-1.2.10/configure.in -=================================================================== ---- pkg-config-0.23.orig/glib-1.2.10/configure.in 2008-01-16 22:52:24.000000000 +0000 -+++ pkg-config-0.23/glib-1.2.10/configure.in 2008-03-26 20:59:12.000000000 +0000 -@@ -1,10 +1,11 @@ - dnl *********************************** - dnl *** include special GLib macros *** - dnl *********************************** --builtin(include, acglib.m4)dnl -+dnl no need, just use aclocal -I . --CL -+dnl builtin(include, acglib.m4)dnl - - # require autoconf 2.13 --AC_PREREQ(2.13) -+AC_PREREQ(2.53) - - # init autoconf (and check for presence of glist.c) - AC_INIT(glist.c) -@@ -13,11 +14,48 @@ - cflags_set=${CFLAGS+set} - - # we rewrite this file -+if test "x$cross_compiling" != "xyes"; then - rm -f glibconfig-sysdefs.h -+fi -+ -+# config defines -+ -+AH_TEMPLATE([ENABLE_MEM_CHECK], -+ [Define if enabling memory checking]) -+AH_TEMPLATE([ENABLE_MEM_PROFILE], []) -+AH_TEMPLATE([GLIB_BINARY_AGE], []) -+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], []) -+AH_TEMPLATE([GLIB_INTERFACE_AGE], []) -+AH_TEMPLATE([GLIB_MAJOR_VERSION], []) -+AH_TEMPLATE([GLIB_MINOR_VERSION], []) -+AH_TEMPLATE([GLIB_MICRO_VERSION], []) -+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], []) -+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], []) -+AH_TEMPLATE([G_HAVE_INLINE], []) -+AH_TEMPLATE([G_HAVE___INLINE], []) -+AH_TEMPLATE([G_HAVE___INLINE__], []) -+AH_TEMPLATE([G_THREAD_SOURCE], []) -+AH_TEMPLATE([G_VA_COPY], []) -+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], []) -+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], []) -+AH_TEMPLATE([HAVE_GETPWUID_R], []) -+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], []) -+AH_TEMPLATE([HAVE_WCHAR_H], []) -+AH_TEMPLATE([HAVE_WCTYPE_H], []) -+AH_TEMPLATE([NO_FD_SET], []) -+AH_TEMPLATE([NO_SYS_ERRLIST], []) -+AH_TEMPLATE([NO_SYS_SIGLIST], []) -+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], []) -+AH_TEMPLATE([REALLOC_0_WORKS], []) -+ - - dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they - dnl are available for $ac_help expansion (don't we all *love* autoconf?) --GLIB_AC_DIVERT_BEFORE_HELP([ -+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE) -+#dnl - # - # The following version number definitions apply to GLib, GModule and GThread - # as a whole, so if changes occoured in any of them, they are all -@@ -38,7 +76,7 @@ - GLIB_BINARY_AGE=10 - GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION - dnl --]) -+#AC_DIVERT_POP()dnl - - AC_SUBST(GLIB_MAJOR_VERSION) - AC_SUBST(GLIB_MINOR_VERSION) -@@ -72,22 +110,20 @@ - AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE) - - dnl Initialize libtool --AC_PROG_LIBTOOL -+AM_PROG_LIBTOOL - - dnl Initialize maintainer mode - AM_MAINTAINER_MODE - --AC_CANONICAL_HOST -- - dnl figure debugging default, prior to $ac_help setup - dnl --GLIB_AC_DIVERT_BEFORE_HELP([ -+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl - if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then - debug_default=yes - else - debug_default=minimum - fi --]) dnl -+#AC_DIVERT_POP()dnl - - dnl declare --enable-* args and collect ac_help strings - AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) -@@ -194,7 +230,9 @@ - CFLAGS=$glib_save_CFLAGS - AC_MSG_WARN( - [No ANSI prototypes found in library. (-std1 didn't work.)]) -+ , AC_MSG_WARN([Skipping test due to crosscompilation]) - ) -+ , AC_MSG_WARN([Skipping test due to crosscompilation]) - ) - LIBS=$glib_save_LIBS - -@@ -336,7 +374,7 @@ - if test $gtk_ok = yes; then - AC_MSG_RESULT([yes, found in sys/types.h]) - else -- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes) -+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) - if test $gtk_ok = yes; then - AC_DEFINE(HAVE_SYS_SELECT_H) - AC_MSG_RESULT([yes, found in sys/select.h]) -@@ -409,7 +447,7 @@ - glib_cv_sane_realloc=no - ,) - ]) --if test x$glib_cv_sane_realloc = xyes; then -+if test "x$glib_cv_sane_realloc" = "xyes"; then - AC_DEFINE(REALLOC_0_WORKS) - fi - AC_MSG_RESULT($glib_cv_sane_realloc) -@@ -487,7 +525,8 @@ - ]) - if test "x$glib_cv_va_copy" = "xyes"; then - AC_DEFINE(G_VA_COPY, va_copy) --else if test "x$glib_cv___va_copy" = "xyes"; then -+else -+if test "x$glib_cv___va_copy" = "xyes"; then - AC_DEFINE(G_VA_COPY, __va_copy) - fi - fi -@@ -496,6 +535,7 @@ - fi - AC_MSG_RESULT($glib_cv_va_val_copy) - -+AC_MSG_WARN([hi mom]) - - dnl *********************** - dnl *** g_module checks *** -@@ -507,23 +547,27 @@ - G_MODULE_BROKEN_RTLD_GLOBAL=0 - G_MODULE_HAVE_DLERROR=0 - dnl *** dlopen() and dlsym() in system libraries -+AC_CHECK_FUNC(dlopen,[ -+ AC_CHECK_FUNC(dlsym,[ -+ G_MODULE_IMPL=G_MODULE_IMPL_DL -+ ], -+ )], -+) - if test -z "$G_MODULE_IMPL"; then -- AC_CHECK_FUNC(dlopen, -- [AC_CHECK_FUNC(dlsym, -+ AC_CHECK_FUNC(dlopen,[ -+ AC_CHECK_FUNC(dlsym,[ - G_MODULE_IMPL=G_MODULE_IMPL_DL -- ,)] -- ,) -- -+ ])], -+ ) - fi -- - dnl *** dlopen() and dlsym() in libdl - if test -z "$G_MODULE_IMPL"; then -- AC_CHECK_LIB(dl, dlopen, -- [AC_CHECK_LIB(dl, dlsym, -+ AC_CHECK_LIB(dl, dlopen,[ -+ AC_CHECK_LIB(dl, dlsym,[ - G_MODULE_LIBS=-ldl - G_MODULE_IMPL=G_MODULE_IMPL_DL -- ,)] -- ,) -+ ])] -+ ) - fi - dnl *** shl_load() in libdld (HP-UX) - if test -z "$G_MODULE_IMPL"; then -@@ -633,6 +677,7 @@ - AC_SUBST(G_MODULE_NEED_USCORE) - AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL) - AC_SUBST(GLIB_DEBUG_FLAGS) -+AC_MSG_WARN([hi mom]) - - - dnl *********************** -@@ -869,40 +914,50 @@ - fi - if test x"$have_threads" = xposix; then - LIBS="$LIBS $G_THREAD_LIBS" -- AC_MSG_CHECKING(whether pthread_getspecific is posix like) - # PCThreads has pthread_getspecific(pthread_key_t, void **); -- AC_TRY_COMPILE([#include ], -- [pthread_getspecific(0,NULL);], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)]) -- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like) -+ AC_CACHE_CHECK([whether pthread_getspecific is posix like], -+ [glib_cv_sys_pthread_getspecific_posix], -+ AC_TRY_COMPILE([#include ], -+ [pthread_getspecific(0,NULL);], -+ [glib_cv_sys_pthread_getspecific_posix=no], -+ [glib_cv_sys_pthread_getspecific_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX) -+ fi - # DCE Threads return 1 as success, posix 0. what a mess. -- AC_TRY_RUN([#include -- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -- int main () { -- return !pthread_mutex_trylock (&mutex); }], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)]) -- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like) -+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like], -+ [glib_cv_sys_pthread_mutex_trylock_posix], -+ AC_TRY_RUN([#include -+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -+ int main () { -+ return !pthread_mutex_trylock (&mutex); }], -+ [glib_cv_sys_pthread_mutex_trylock_posix=no], -+ [glib_cv_sys_pthread_mutex_trylock_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX) -+ fi - # DCE Threads return -1 as failure, posix ETIMEDOUT. -- AC_TRY_RUN([#include -- #include -- int main () { -- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -- pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -- struct timeval tval; -- struct timespec tspec; -- gettimeofday (&tval, NULL); -- tspec.tv_sec = tval.tv_sec; -- tspec.tv_nsec = 0; -- pthread_mutex_lock (&mutex); -- return pthread_cond_timedwait (&cond,&mutex,&tspec) -- != -1;}], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)]) -+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like], -+ [glib_cv_sys_pthread_cond_timedwait_posix], -+ AC_TRY_RUN([#include -+ int main () { -+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -+ struct timeval tval; -+ struct timespec tspec; -+ gettimeofday (&tval, NULL); -+ tspec.tv_sec = tval.tv_sec; -+ tspec.tv_nsec = 0; -+ return pthread_cond_timedwait (&cond,&mutex,&tspec) -+ != -1;}], -+ [glib_cv_sys_pthread_cond_timedwait_posix=no], -+ [glib_cv_sys_pthread_cond_timedwait_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX) -+ fi - fi - LIBS="$glib_save_LIBS" - CFLAGS="$glib_save_CFLAGS" -@@ -946,13 +1001,14 @@ - dnl **************************************** - dnl *** GLib POLL* compatibility defines *** - dnl **************************************** -+if test x"$cross_compiling" != xyes; then - GLIB_SYSDEFS( - [#include - #include ], - POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32, - glibconfig-sysdefs.h, - =) -- -+fi - - dnl ****************************** - dnl *** output the whole stuff *** -@@ -1005,7 +1061,7 @@ - echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile - fi - -- cat >> $outfile <<_______EOF -+ cat >> $outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile - fi - - - -- cat >>$outfile <<_______EOF -+ cat >>$outfile <>$outfile - if test x$g_mutex_has_default = xyes; then -- cat >>$outfile <<_______EOF -+ cat >>$outfile <aligned_pad_u)) : \ - g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex))) --_______EOF -+EOF - else -- cat >>$outfile <<_______EOF -+ cat >>$outfile <>$outfile -@@ -1126,15 +1182,15 @@ - g_bit_sizes="$g_bit_sizes 64" - fi - for bits in $g_bit_sizes; do -- cat >>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile - fi - - -- cat >>$outfile <<_______EOF -+ cat >>$outfile < - --#ifdef G_OS_WIN32 --/* No hardcoded paths in the binary, thanks */ --/* It's OK to leak this */ --#undef PKG_CONFIG_PC_PATH --#define PKG_CONFIG_PC_PATH \ -- g_strconcat (g_win32_get_package_installation_subdirectory (NULL, NULL, "lib/pkgconfig"), \ -- ";", \ -- g_win32_get_package_installation_subdirectory (NULL, NULL, "share/pkgconfig"), \ -- NULL) --#endif -- - typedef enum - { - LESS_THAN, -@@ -142,6 +131,10 @@ - extern int dont_define_prefix; - /* The name of the variable that acts as prefix, unless it is "prefix" */ - extern char *prefix_variable; -+/* Path to pkg-config installation directory, it is used instead of -+ * PKG_CONFIG_PC_PATH for finding /lib/pkgconfig and /share/pkgconfig -+ */ -+extern char *pkg_config_pc_path; - - /* If TRUE, output flags in MSVC syntax. */ - extern int msvc_syntax; ---- main.c.orig 2011-05-15 13:06:06 +0400 -+++ main.c 2012-03-31 06:39:45 +0400 -@@ -40,6 +40,9 @@ - static int want_verbose_errors = 0; - static int want_stdout_errors = 0; - char *pcsysrootdir = NULL; -+#ifdef G_OS_WIN32 -+char *pkg_config_pc_path = NULL; -+#endif - - void - debug_spew (const char *format, ...) -@@ -293,6 +296,30 @@ - debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n"); - } - -+#ifdef G_OS_WIN32 -+ pkg_config_pc_path = g_win32_get_package_installation_directory_of_module (NULL); -+ if (pkg_config_pc_path == NULL) -+ { -+ /* This variable is used later to add pc_path to the virtual pkg-config -+ * package. Can't proceed without it. This only happens when -+ * GetModuleFilename() fails; if it does - that failure should be -+ * investigated and fixed. -+ */ -+ verbose_error ("Failed to get pkg_config_pc_path\n"); -+ exit (1); -+ } -+ else -+ { -+ char *lpath, *shpath; -+ lpath = g_build_filename (pkg_config_pc_path, "lib", "pkgconfig", NULL); -+ shpath = g_build_filename (pkg_config_pc_path, "share", "pkgconfig", NULL); -+ free (pkg_config_pc_path); -+ pkg_config_pc_path = g_strconcat (lpath, G_SEARCHPATH_SEPARATOR_S, shpath, NULL); -+ free (lpath); -+ free (shpath); -+ } -+#endif -+ - search_path = getenv ("PKG_CONFIG_PATH"); - if (search_path) - { -@@ -304,7 +331,11 @@ - } - else - { -+#ifdef G_OS_WIN32 -+ add_search_dirs(pkg_config_pc_path, G_SEARCHPATH_SEPARATOR_S); -+#else - add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S); -+#endif - } - - pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR"); ---- pkg.c.orig 2011-05-15 16:04:08 +0400 -+++ pkg.c 2012-03-31 06:12:08 +0400 -@@ -240,7 +240,11 @@ - - if (pkg->vars == NULL) - pkg->vars = g_hash_table_new (g_str_hash, g_str_equal); -+#ifdef G_OS_WIN32 -+ g_hash_table_insert (pkg->vars, "pc_path", pkg_config_pc_path); -+#else - g_hash_table_insert (pkg->vars, "pc_path", PKG_CONFIG_PC_PATH); -+#endif - - debug_spew ("Adding virtual 'pkg-config' package to list of known packages\n"); - g_hash_table_insert (packages, pkg->key, pkg); - diff --git a/recipes/pkg-config/pkg-config.inc b/recipes/pkg-config/pkg-config.inc index 9ee9fd4ef..f720c6b7b 100644 --- a/recipes/pkg-config/pkg-config.inc +++ b/recipes/pkg-config/pkg-config.inc @@ -7,7 +7,7 @@ HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" RECIPE_TYPES = "machine native sdk" -inherit autotools-autoreconf pkgconfig +inherit autotools-autoreconf pkgconfig gettext DEPENDS = " libglib" DEPENDS:>HOST_LIBC_glibc = " libdl libpthread" @@ -21,6 +21,12 @@ SRC_HOST_SITEFILES = "${SRCDIR}/common.site ${SRCDIR}/host_cpu.site" acpaths = "-I ." EXTRA_OECONF = "--with-pc-path=''" +EXTRA_OECONF_NATIVE += "GLIB_CFLAGS=\"-I${STAGE_DIR}/${HOST_TYPE}${stage_includedir}/glib-2.0 -I${STAGE_DIR}/${HOST_TYPE}${stage_libdir}/glib-2.0/include/\"" +EXTRA_OECONF_NATIVE += "GLIB_LIBS=\"-L${STAGE_DIR}/${HOST_TYPE}${stage_libdir} -lglib-2.0\"" +EXTRA_OECONF:>native = " ${EXTRA_OECONF_NATIVE}" + +DEPENDS_${PN} += "libintl" +RDEPENDS_${PN} += "libintl" do_install() { do_install_make diff --git a/recipes/pkg-config/pkg-config_0.26.oe.sig b/recipes/pkg-config/pkg-config_0.26.oe.sig deleted file mode 100644 index 242915982..000000000 --- a/recipes/pkg-config/pkg-config_0.26.oe.sig +++ /dev/null @@ -1 +0,0 @@ -fd71a70b023b9087c8a7bb76a0dc135a61059652 pkg-config-0.26.tar.gz diff --git a/recipes/pkg-config/pkg-config_0.26.oe b/recipes/pkg-config/pkg-config_0.28.oe similarity index 100% rename from recipes/pkg-config/pkg-config_0.26.oe rename to recipes/pkg-config/pkg-config_0.28.oe diff --git a/recipes/pkg-config/pkg-config_0.28.oe.sig b/recipes/pkg-config/pkg-config_0.28.oe.sig new file mode 100644 index 000000000..3b595c61f --- /dev/null +++ b/recipes/pkg-config/pkg-config_0.28.oe.sig @@ -0,0 +1 @@ +71853779b12f958777bffcb8ca6d849b4d3bed46 pkg-config-0.28.tar.gz From 6b8923a61261b600ad278aebbb3067105ab2ea27 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 12:15:39 +0200 Subject: [PATCH 18/23] gettext: Update to last version --- recipes/gettext/gettext-0.18.1.1/ac-fix.patch | 12 ---- ...text0.18.1.1-9ubuntu1-glibc-2.16-fix.patch | 56 ------------------- .../gettext-0.18-gettextpo-woe32-memchr.patch | 0 .../libtool-bindir.patch | 0 .../osx.patch | 0 recipes/gettext/gettext.inc | 8 ++- recipes/gettext/gettext_0.18.1.1.oe.sig | 1 - ...{gettext_0.18.1.1.oe => gettext_0.19.4.oe} | 2 - recipes/gettext/gettext_0.19.4.oe.sig | 1 + 9 files changed, 6 insertions(+), 74 deletions(-) delete mode 100644 recipes/gettext/gettext-0.18.1.1/ac-fix.patch delete mode 100644 recipes/gettext/gettext-0.18.1.1/gettext0.18.1.1-9ubuntu1-glibc-2.16-fix.patch rename recipes/gettext/{gettext-0.18.1.1 => gettext-0.19.4}/gettext-0.18-gettextpo-woe32-memchr.patch (100%) rename recipes/gettext/{gettext-0.18.1.1 => gettext-0.19.4}/libtool-bindir.patch (100%) rename recipes/gettext/{gettext-0.18.1.1 => gettext-0.19.4}/osx.patch (100%) delete mode 100644 recipes/gettext/gettext_0.18.1.1.oe.sig rename recipes/gettext/{gettext_0.18.1.1.oe => gettext_0.19.4.oe} (71%) create mode 100644 recipes/gettext/gettext_0.19.4.oe.sig diff --git a/recipes/gettext/gettext-0.18.1.1/ac-fix.patch b/recipes/gettext/gettext-0.18.1.1/ac-fix.patch deleted file mode 100644 index 5ffcb57d0..000000000 --- a/recipes/gettext/gettext-0.18.1.1/ac-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurd gettext-0.18.1.1/gettext-runtime/m4/ansi-c++.m4 gettext-0.18.1.1/gettext-runtime/m4/ansi-c++.m4 ---- gettext-0.18.1.1/gettext-runtime/m4/ansi-c++.m4 2010-06-06 15:49:57.000000000 +0300 -+++ gettext-0.18.1.1/gettext-runtime/m4/ansi-c++.m4 2011-07-31 11:08:12.000000000 +0300 -@@ -11,7 +11,7 @@ - - AC_DEFUN([gt_PROG_ANSI_CXX], - [ --AC_CHECK_PROGS(CXX, $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC, :) -+AC_CHECK_TOOLS(CXX, $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC, :) - if test "$CXX" != ":"; then - dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit - dnl upon failure. diff --git a/recipes/gettext/gettext-0.18.1.1/gettext0.18.1.1-9ubuntu1-glibc-2.16-fix.patch b/recipes/gettext/gettext-0.18.1.1/gettext0.18.1.1-9ubuntu1-glibc-2.16-fix.patch deleted file mode 100644 index 931736087..000000000 --- a/recipes/gettext/gettext-0.18.1.1/gettext0.18.1.1-9ubuntu1-glibc-2.16-fix.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h -=================================================================== ---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2012-11-15 18:46:24.000000000 +0000 -+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-11-15 19:14:37.000000000 +0000 -@@ -138,10 +138,12 @@ - #endif - - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning. */ - #undef gets -+#ifdef HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif -+#undef gets - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h -=================================================================== ---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 19:56:12.000000000 +0000 -+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-11-15 19:11:15.000000000 +0000 -@@ -138,10 +138,11 @@ - #endif - - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning. */ - #undef gets -+#ifdef HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -Index: gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h -=================================================================== ---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 19:58:03.000000000 +0000 -+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-11-15 19:11:53.000000000 +0000 -@@ -138,10 +138,11 @@ - #endif - - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning. */ - #undef gets -+#ifdef HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ - diff --git a/recipes/gettext/gettext-0.18.1.1/gettext-0.18-gettextpo-woe32-memchr.patch b/recipes/gettext/gettext-0.19.4/gettext-0.18-gettextpo-woe32-memchr.patch similarity index 100% rename from recipes/gettext/gettext-0.18.1.1/gettext-0.18-gettextpo-woe32-memchr.patch rename to recipes/gettext/gettext-0.19.4/gettext-0.18-gettextpo-woe32-memchr.patch diff --git a/recipes/gettext/gettext-0.18.1.1/libtool-bindir.patch b/recipes/gettext/gettext-0.19.4/libtool-bindir.patch similarity index 100% rename from recipes/gettext/gettext-0.18.1.1/libtool-bindir.patch rename to recipes/gettext/gettext-0.19.4/libtool-bindir.patch diff --git a/recipes/gettext/gettext-0.18.1.1/osx.patch b/recipes/gettext/gettext-0.19.4/osx.patch similarity index 100% rename from recipes/gettext/gettext-0.18.1.1/osx.patch rename to recipes/gettext/gettext-0.19.4/osx.patch diff --git a/recipes/gettext/gettext.inc b/recipes/gettext/gettext.inc index f943c40a3..bf8c276df 100644 --- a/recipes/gettext/gettext.inc +++ b/recipes/gettext/gettext.inc @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" RECIPE_TYPES = "machine native sdk" -inherit c++ autotools library make-vpath -DEPENDS_AUTORECONF = "" +DEPENDS_AUTORECONF = "native:automake" +inherit c++ autotools-autoreconf library make-vpath require conf/fetch/gnu.conf SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz" @@ -66,7 +66,7 @@ EXTRA_OECONF_GETTEXT:native = "--disable-curses --with-included-gettext" EXTRA_OECONF_GETTEXT:HOST_OS_mingw32 = "--disable-curses --with-included-gettext" FILES_${PN} += "${libdir}/gettext ${datadir}/gettext" -COMMON_DEPENDS = "libintl libgettextpo libgettextlib \ +COMMON_DEPENDS = "libintl libgettextpo libgettextlib libgettextsrc \ libiconv ${DEPENDS_LIBNCURSES} ${DEPENDS_LIBDL} libm" DEPENDS_${PN} = "${COMMON_DEPENDS}" RDEPENDS_${PN} = "${COMMON_DEPENDS}" @@ -76,6 +76,8 @@ AUTO_PACKAGE_UTILS = "autopoint envsubst gettext gettextize gettext.sh \ msgattrib msgcat msgcmp msgcomm msgconv msgen msgexec msgfilter \ msgfmt msggrep msginit msgmerge msgunfmt msguniq ngettext \ recode-sr-latin xgettext" +AUTO_PACKAGE_UTILS_RDEPENDS += "${COMMON_DEPENDS}" +AUTO_PACKAGE_UTILS_DEPENDS += "${COMMON_DEPENDS}" DEPENDS_${PN}-gettext-sh = "${PN}-gettext ${PN}-ngettext" RDEPENDS_${PN}-gettext-sh = "${PN}-gettext ${PN}-ngettext" PACKAGES =+ "${PN}-utils" diff --git a/recipes/gettext/gettext_0.18.1.1.oe.sig b/recipes/gettext/gettext_0.18.1.1.oe.sig deleted file mode 100644 index c0714bed3..000000000 --- a/recipes/gettext/gettext_0.18.1.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -5009deb02f67fc3c59c8ce6b82408d1d35d4e38f gettext-0.18.1.1.tar.gz diff --git a/recipes/gettext/gettext_0.18.1.1.oe b/recipes/gettext/gettext_0.19.4.oe similarity index 71% rename from recipes/gettext/gettext_0.18.1.1.oe rename to recipes/gettext/gettext_0.19.4.oe index fa13e47aa..288fbe05f 100644 --- a/recipes/gettext/gettext_0.18.1.1.oe +++ b/recipes/gettext/gettext_0.19.4.oe @@ -2,9 +2,7 @@ LICENSE = "GPL-3.0+ & LGPL-2.1+" require gettext.inc -SRC_URI += "file://ac-fix.patch" SRC_URI += "file://gettext-0.18-gettextpo-woe32-memchr.patch" -SRC_URI += "file://gettext0.18.1.1-9ubuntu1-glibc-2.16-fix.patch" SRC_URI:>HOST_KERNEL_darwin = " file://osx.patch" SRC_URI:>HOST_LIBC_mingw = " file://libtool-bindir.patch" diff --git a/recipes/gettext/gettext_0.19.4.oe.sig b/recipes/gettext/gettext_0.19.4.oe.sig new file mode 100644 index 000000000..9014a9e34 --- /dev/null +++ b/recipes/gettext/gettext_0.19.4.oe.sig @@ -0,0 +1 @@ +c473f4f268501d971b913197fb07767e628644bb gettext-0.19.4.tar.gz From 222f30531f419c118a4648e8be4d7356eefd31b0 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 12:16:21 +0200 Subject: [PATCH 19/23] automake: Update to last version --- .../automake/automake-1.14.1/runtime.patch | 56 +++++++++++++++++++ recipes/automake/automake.inc | 11 +++- recipes/automake/automake_1.11.3.oe | 12 ---- recipes/automake/automake_1.11.3.oe.sig | 1 - recipes/automake/automake_1.14.1.oe | 3 + recipes/automake/automake_1.14.1.oe.sig | 1 + 6 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 recipes/automake/automake-1.14.1/runtime.patch delete mode 100644 recipes/automake/automake_1.11.3.oe delete mode 100644 recipes/automake/automake_1.11.3.oe.sig create mode 100644 recipes/automake/automake_1.14.1.oe create mode 100644 recipes/automake/automake_1.14.1.oe.sig diff --git a/recipes/automake/automake-1.14.1/runtime.patch b/recipes/automake/automake-1.14.1/runtime.patch new file mode 100644 index 000000000..83172f685 --- /dev/null +++ b/recipes/automake/automake-1.14.1/runtime.patch @@ -0,0 +1,56 @@ +diff -urN a/bin/aclocal.in b/bin/aclocal.in +--- a/bin/aclocal.in 2013-11-03 01:48:13.000000000 +0100 ++++ b/bin/aclocal.in 2014-11-05 12:06:16.000000000 +0100 +@@ -25,9 +25,11 @@ + # Written by Tom Tromey , and + # Alexandre Duret-Lutz . + ++my $aclocalprefix; + BEGIN + { +- @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@') ++ $aclocalprefix = $ENV{'aclocalprefix'} || ''; ++ @Aclocal::perl_libdirs = ($aclocalprefix . '@datadir@/@PACKAGE@-@APIVERSION@') + unless @Aclocal::perl_libdirs; + unshift @INC, @Aclocal::perl_libdirs; + } +@@ -69,8 +71,8 @@ + # ACLOCAL_PATH environment variable, and reset with the '--system-acdir' + # option. + my @user_includes = (); +-my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); +-my @system_includes = ('@datadir@/aclocal'); ++my @automake_includes = ($aclocalprefix . "@datadir@/aclocal-$APIVERSION"); ++my @system_includes = ($aclocalprefix . '@datadir@/aclocal'); + + # Whether we should copy M4 file in $user_includes[0]. + my $install = 0; +diff -urN a/bin/automake.in b/bin/automake.in +--- a/bin/automake.in 2013-11-03 01:48:13.000000000 +0100 ++++ b/bin/automake.in 2014-11-05 13:18:32.000000000 +0100 +@@ -29,9 +29,11 @@ + + use strict; + ++my $aclocalprefix; + BEGIN + { +- @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@') ++ $aclocalprefix = $ENV{'aclocalprefix'} || ''; ++ @Automake::perl_libdirs = ($aclocalprefix . '@datadir@/@PACKAGE@-@APIVERSION@') + unless @Automake::perl_libdirs; + unshift @INC, @Automake::perl_libdirs; + +diff -urN a/lib/Automake/Config.in b/lib/Automake/Config.in +--- a/lib/Automake/Config.in 2013-07-22 00:25:26.000000000 +0200 ++++ b/lib/Automake/Config.in 2014-11-05 13:19:11.000000000 +0100 +@@ -32,7 +32,8 @@ + our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; + our $VERSION = '@VERSION@'; + our $RELEASE_YEAR = '@RELEASE_YEAR@'; +-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; ++my $aclocalprefix = $ENV{'aclocalprefix'} || ''; ++our $libdir = $aclocalprefix . '@datadir@/@PACKAGE@-@APIVERSION@'; + + our $perl_threads = 0; + # We need at least this version for CLONE support. diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc index 33d37e531..6aef77696 100644 --- a/recipes/automake/automake.inc +++ b/recipes/automake/automake.inc @@ -5,9 +5,18 @@ DESCRIPTION = "Automake is a tool for automatically generating Makefile.in \ LICENSE = "GPLv2" HOMEPAGE = "http://www.gnu.org/software/automake/" +RECIPE_TYPES = "machine sdk native" + require conf/fetch/gnu.conf SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz " -inherit autotools +inherit autotools automate + +RDEPENDS_${PN} += "autoconf" + +do_install () { + oe_runmake 'DESTDIR=${D}' install + install -d ${D}${datadir} +} FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/recipes/automake/automake_1.11.3.oe b/recipes/automake/automake_1.11.3.oe deleted file mode 100644 index d2b5926b6..000000000 --- a/recipes/automake/automake_1.11.3.oe +++ /dev/null @@ -1,12 +0,0 @@ -require automake.inc -LICENSE="GPLv2" - -RECIPE_TYPES = "machine sdk native" - -DEPENDS = "native:autoconf" -RDEPENDS_${PN} += "autoconf" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${datadir} -} diff --git a/recipes/automake/automake_1.11.3.oe.sig b/recipes/automake/automake_1.11.3.oe.sig deleted file mode 100644 index 4688fdf1b..000000000 --- a/recipes/automake/automake_1.11.3.oe.sig +++ /dev/null @@ -1 +0,0 @@ -537f5964bb7ec7d0df6544e3d10d9631fe7460f0 automake-1.11.3.tar.gz diff --git a/recipes/automake/automake_1.14.1.oe b/recipes/automake/automake_1.14.1.oe new file mode 100644 index 000000000..8a497f213 --- /dev/null +++ b/recipes/automake/automake_1.14.1.oe @@ -0,0 +1,3 @@ +require automake.inc + +SRC_URI += "file://runtime.patch" diff --git a/recipes/automake/automake_1.14.1.oe.sig b/recipes/automake/automake_1.14.1.oe.sig new file mode 100644 index 000000000..a5c650171 --- /dev/null +++ b/recipes/automake/automake_1.14.1.oe.sig @@ -0,0 +1 @@ +0bb1714b78d70cab9907d2013082978a28f48a46 automake-1.14.1.tar.gz From 875755de53f7328303ff6932bd2d9d289f29ae8f Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 12:16:51 +0200 Subject: [PATCH 20/23] autoconf: Update to last version --- .../{autoconf-2.68 => autoconf-2.69}/program_prefix.patch | 0 recipes/autoconf/autoconf.inc | 5 ++++- recipes/autoconf/autoconf_2.68.oe.sig | 1 - recipes/autoconf/{autoconf_2.68.oe => autoconf_2.69.oe} | 0 recipes/autoconf/autoconf_2.69.oe.sig | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) rename recipes/autoconf/{autoconf-2.68 => autoconf-2.69}/program_prefix.patch (100%) delete mode 100644 recipes/autoconf/autoconf_2.68.oe.sig rename recipes/autoconf/{autoconf_2.68.oe => autoconf_2.69.oe} (100%) create mode 100644 recipes/autoconf/autoconf_2.69.oe.sig diff --git a/recipes/autoconf/autoconf-2.68/program_prefix.patch b/recipes/autoconf/autoconf-2.69/program_prefix.patch similarity index 100% rename from recipes/autoconf/autoconf-2.68/program_prefix.patch rename to recipes/autoconf/autoconf-2.69/program_prefix.patch diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc index 4781fe987..5845e43e9 100644 --- a/recipes/autoconf/autoconf.inc +++ b/recipes/autoconf/autoconf.inc @@ -8,7 +8,7 @@ RECIPE_TYPES = "machine native sdk" DEPENDS = "native:m4 native:perl" require conf/fetch/gnu.conf -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz" inherit autotools @@ -48,3 +48,6 @@ FILES_${PN} += "${datadir}/autoconf" PACKAGES += "${PN}-emacs" FILES_${PN}-emacs += "${datadir}/emacs" + +PACKAGES += "${PN}-xemacs" +FILES_${PN}-xemacs += "${datadir}/xemacs" diff --git a/recipes/autoconf/autoconf_2.68.oe.sig b/recipes/autoconf/autoconf_2.68.oe.sig deleted file mode 100644 index ea79c3e6c..000000000 --- a/recipes/autoconf/autoconf_2.68.oe.sig +++ /dev/null @@ -1 +0,0 @@ -b534c293b22048c022b1ff3a372b9c03f26170b4 autoconf-2.68.tar.bz2 diff --git a/recipes/autoconf/autoconf_2.68.oe b/recipes/autoconf/autoconf_2.69.oe similarity index 100% rename from recipes/autoconf/autoconf_2.68.oe rename to recipes/autoconf/autoconf_2.69.oe diff --git a/recipes/autoconf/autoconf_2.69.oe.sig b/recipes/autoconf/autoconf_2.69.oe.sig new file mode 100644 index 000000000..a3a7da14e --- /dev/null +++ b/recipes/autoconf/autoconf_2.69.oe.sig @@ -0,0 +1,2 @@ +da39a3ee5e6b4b0d3255bfef95601890afd80709 autoconf-2.69.tar.bz2 +562471cbcb0dd0fa42a76665acf0dbb68479b78a autoconf-2.69.tar.gz From 2f1b8d0618e9ebf154253c082fc11ce8cab93c77 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 12:18:26 +0200 Subject: [PATCH 21/23] glib: gettext is mandatory --- recipes/glib/glib-common.inc | 11 +++++++---- recipes/glib/glib-initial.inc | 3 +++ recipes/glib/glib_2.44.0.oe | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/recipes/glib/glib-common.inc b/recipes/glib/glib-common.inc index 988c68f71..194ed716d 100644 --- a/recipes/glib/glib-common.inc +++ b/recipes/glib/glib-common.inc @@ -4,7 +4,8 @@ DESCRIPTION = "GLib is a general-purpose utility library, which provides many \ utilities, a main loop abstraction, and so on. It works on many \ UNIX-like platforms, Windows, OS/2 and BeOS." -inherit c++ autotools make-vpath + +inherit c++ autotools make-vpath gettext DEPENDS = "host-cross:gtk-doc libz libffi" @@ -81,18 +82,20 @@ RDEPENDS_GLIB_UTILS:native = "" RDEPENDS_${PN}-utils = "${RDEPENDS_GLIB_UTILS}" DEPENDS_${PN}-libglib-2.0 += "libc libgcc ${DEPENDS_PCRE} ${DEPENDS_LIBDL} \ ${DEPENDS_LIBINTL} ${DEPENDS_LIBRESOLV} \ - ${DEPENDS_THREADS}" + ${DEPENDS_THREADS} ${DEPENDS_ICONV}" DEPENDS_${PN}-libgthread-2.0 += "libc ${DEPENDS_THREADS} ${DEPENDS_PCRE} \ + ${DEPENDS_ICONV} \ libglib-2.0" DEPENDS_${PN}-libgobject-2.0 += "libc libgcc libffi libgthread-2.0 \ ${DEPENDS_THREADS} ${DEPENDS_PCRE} \ + ${DEPENDS_ICONV} \ libglib-2.0" DEPENDS_${PN}-libgmodule-2.0 += "libc ${DEPENDS_LIBDL} ${DEPENDS_PCRE} \ - libglib-2.0 ${DEPENDS_THREADS}" + libglib-2.0 ${DEPENDS_THREADS} ${DEPENDS_ICONV}" DEPENDS_${PN}-libgio-2.0 += "libc libgcc ${DEPENDS_LIBDL} ${DEPENDS_LIBRESOLV} \ libz libffi libglib-2.0 libgmodule-2.0 \ libgobject-2.0 libgthread-2.0 ${DEPENDS_PCRE} \ - ${DEPENDS_THREADS}" + ${DEPENDS_THREADS} ${DEPENDS_ICONV}" FILES_${PN}-libgio-2.0-dev += "${libdir}/pkgconfig/gio-*-2.0.pc" FILES_${PN}-libgmodule-2.0-dev += "${libdir}/pkgconfig/gmodule-*-2.0.pc" diff --git a/recipes/glib/glib-initial.inc b/recipes/glib/glib-initial.inc index 3e701e6dc..81bae8ff4 100644 --- a/recipes/glib/glib-initial.inc +++ b/recipes/glib/glib-initial.inc @@ -18,7 +18,10 @@ EXTRA_OECONF += 'DBUS1_LIBS=""' # Minimize external dependencies for native glib EXTRA_OECONF += "${EXTRA_OECONF_ICONV}" + +RECIPE_FLAGS += "glib_iconv" EXTRA_OECONF_ICONV = "--with-libiconv=no" +EXTRA_OECONF_ICONV:USE_glib_iconv = "--with-libiconv=gnu" EXTRA_OECONF_ICONV:HOST_KERNEL_darwin = "--with-libiconv=native" EXTRA_OECONF += "--with-pcre=internal" EXTRA_OECONF += "--disable-fam" diff --git a/recipes/glib/glib_2.44.0.oe b/recipes/glib/glib_2.44.0.oe index 1fe3c6cab..84f985548 100644 --- a/recipes/glib/glib_2.44.0.oe +++ b/recipes/glib/glib_2.44.0.oe @@ -3,8 +3,9 @@ LICENSE = "LGPL-2.0+" require ${PN}.inc +inherit autotools-autoreconf gettext + SRC_URI += "file://001-automake-compat.patch" -inherit autotools-autoreconf SRC_URI += "file://100-fix-gio-linking.patch" SRC_URI:>HOST_LIBC_mingw = " file://libtool-bindir.patch" From b179cd861e745edb3e160ddb0324a7a5242a2d82 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 12:18:57 +0200 Subject: [PATCH 22/23] glib: fix configuration --- recipes/glib/glib-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/glib/glib-common.inc b/recipes/glib/glib-common.inc index 194ed716d..af44caff9 100644 --- a/recipes/glib/glib-common.inc +++ b/recipes/glib/glib-common.inc @@ -39,12 +39,12 @@ SRC_URI_SUBDIR = "${@'.'.join(d.getVar('PV', True).split('.')[:2])}" SRC_URI = "${GNOME_MIRROR}/glib/${SRC_URI_SUBDIR}/glib-${PV}.tar.xz" S = "${SRCDIR}/glib-${PV}" -EXTRA_OECONF = "--disable-debug \ +EXTRA_OECONF += "--disable-debug \ --disable-selinux \ --disable-xattr \ --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf \ --disable-man \ - --disable-modular-tests \ + --enable-dtrace=no \ " EXTRA_OEMAKE += "'CFLAGS=${CFLAGS}'" From c04d9a755a9d132102f07519e677f1906b16034f Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 12:19:17 +0200 Subject: [PATCH 23/23] glib: fix compilation with old compiler --- recipes/glib/glib-2.44.0/redifinition.patch | 35 +++++++++++++++++++++ recipes/glib/glib-initial_2.44.0.oe | 2 ++ recipes/glib/glib_2.44.0.oe | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 recipes/glib/glib-2.44.0/redifinition.patch diff --git a/recipes/glib/glib-2.44.0/redifinition.patch b/recipes/glib/glib-2.44.0/redifinition.patch new file mode 100644 index 000000000..5181f4c69 --- /dev/null +++ b/recipes/glib/glib-2.44.0/redifinition.patch @@ -0,0 +1,35 @@ +From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Wed, 25 Mar 2015 09:29:49 -0400 +Subject: GListModel: roll back use of type redefinition + +We declare the typedefs for GListModel and GListStore in giotypes.h, as +a matter of convention. This is not actually required, since the +typedef is emitted as part of the G_DECLARE_* macros. + +The giotypes.h approach is only used to avoid cyclic dependencies +between headers, which is not a problem in this case. + +Type redefinition is a C11 feature, and although it was around in some +compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide +use, being the default compiler for OpenBSD. + +Eventually, we will probably hit a case where we actually need to +redefine a type, but since we're not there yet, let's back off a bit. + +diff --git a/gio/giotypes.h b/gio/giotypes.h +index 4342d47..53f8cc9 100644 +--- a/gio/giotypes.h ++++ b/gio/giotypes.h +@@ -61,8 +61,6 @@ typedef struct _GPermission GPermission; + + typedef struct _GMenuModel GMenuModel; + typedef struct _GNotification GNotification; +-typedef struct _GListModel GListModel; +-typedef struct _GListStore GListStore; + + /** + * GDrive: +-- +cgit v0.10.2 + diff --git a/recipes/glib/glib-initial_2.44.0.oe b/recipes/glib/glib-initial_2.44.0.oe index b55553b02..6624daa6a 100644 --- a/recipes/glib/glib-initial_2.44.0.oe +++ b/recipes/glib/glib-initial_2.44.0.oe @@ -3,4 +3,6 @@ LICENSE = "LGPL-2.0+" require ${PN}.inc +SRC_URI += "file://redifinition.patch" + LIBRARY_VERSION = "0" diff --git a/recipes/glib/glib_2.44.0.oe b/recipes/glib/glib_2.44.0.oe index 84f985548..ffeb5e42f 100644 --- a/recipes/glib/glib_2.44.0.oe +++ b/recipes/glib/glib_2.44.0.oe @@ -7,7 +7,7 @@ inherit autotools-autoreconf gettext SRC_URI += "file://001-automake-compat.patch" SRC_URI += "file://100-fix-gio-linking.patch" - +SRC_URI += "file://redifinition.patch" SRC_URI:>HOST_LIBC_mingw = " file://libtool-bindir.patch" export sharedlibdir