Skip to contentSkip to conversation

pango: update upstream-status on a patch

PATCH New Ross Burton 1 participant 4 messages Nov 30, 2017

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

PATCH 1/4 pango: update upstream-status on a patch

Signed-off-by Ross Burton <[email protected]>
---
 .../pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch +1 -2
index 812da21c56f..9e1626e9a0d 100644
@@ -6,7 +6,7 @@ Subject: [PATCH] Drop introspection macros from acinclude.m4
 They take precendence over our customized macros, and so
 introspection doesn't work correctly.
 
-Upstream-Status: Pending [review on oe-core list]
+Upstream-Status: Backport [upstream 5ccfe0]
 Signed-off-by: Alexander Kanavin <[email protected]>
 ---
  acinclude.m4 | 96 ------------------------------------------------------------

@@ -118,4 +118,3 @@ index 8899c7c..48fd5d8 100644
 -])
 -- 
 2.1.4
-
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/4 openssh: don't do aclocal/acinclude dance

Instead, just stop running aclocal.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-connectivity/openssh/openssh_7.6p1.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta/recipes-connectivity/openssh/openssh_7.6p1.bb +2 -4
index ebb9a5734dd..9d940d45907 100644
@@ -48,6 +48,8 @@ inherit autotools-brokensep ptest
 # LFS support:
 CFLAGS += "-D__FILE_OFFSET_BITS=64"
 
+EXTRA_AUTORECONF += "--exclude=aclocal"
+
 # login path is hardcoded in sshd
 EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
                 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \

@@ -73,9 +75,6 @@ do_configure_prepend () {
 	export LD="${CC}"
 	install -m 0644 ${WORKDIR}/sshd_config ${B}/
 	install -m 0644 ${WORKDIR}/ssh_config ${B}/
-	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
-		cp aclocal.m4 acinclude.m4
-	fi
 }
 
 do_compile_ptest() {

@@ -162,4 +161,3 @@ CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"
 ALTERNATIVE_PRIORITY = "90"
 ALTERNATIVE_${PN}-scp = "scp"
 ALTERNATIVE_${PN}-ssh = "ssh"
-
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH 3/4 gperf: merge inc into bb

In reply to Ross Burton
Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-extended/gperf/gperf.inc    | 22 ----------------------
 meta/recipes-extended/gperf/gperf_3.1.bb | 23 +++++++++++++++++++++--
 2 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-extended/gperf/gperf.inc
meta/recipes-extended/gperf/gperf.inc deleted +0 -22
deleted file mode 100644
index a8ce230f652..00000000000
@@ -1,22 +0,0 @@
-DESCRIPTION = "GNU gperf is a perfect hash function generator"
-HOMEPAGE = "http://www.gnu.org/software/gperf"
-SUMMARY  = "Generate a perfect hash function from a set of keywords"
-LICENSE  = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b"
-
-SRC_URI  = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz"
-
-inherit autotools
-
-# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of
-# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal
-EXTRA_AUTORECONF += " -I ${S}"
-
-do_configure_prepend() {
-        if [ ! -e ${S}/acinclude.m4 ]; then
-                cat ${S}/aclocal.m4 > ${S}/acinclude.m4
-        fi
-}
-
-BBCLASSEXTEND = "native"
meta/recipes-extended/gperf/gperf_3.1.bb +21 -2
index 942820b91d5..c680ee183cb 100644
@@ -1,5 +1,24 @@
-require gperf.inc
-
+DESCRIPTION = "GNU gperf is a perfect hash function generator"
+HOMEPAGE = "http://www.gnu.org/software/gperf"
+SUMMARY  = "Generate a perfect hash function from a set of keywords"
+LICENSE  = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b"
 
+SRC_URI  = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz"
 SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e"
 SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2"
+
+inherit autotools
+
+# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of
+# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal
+EXTRA_AUTORECONF += " -I ${S}"
+
+do_configure_prepend() {
+        if [ ! -e ${S}/acinclude.m4 ]; then
+                cat ${S}/aclocal.m4 > ${S}/acinclude.m4
+        fi
+}
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH 4/4 gperf: don't use aclocal.m4/acinclude.m4 dance

In reply to Ross Burton

gperf doesn't use aclocal so don't call aclocal.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-extended/gperf/gperf_3.1.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
meta/recipes-extended/gperf/gperf_3.1.bb +3 -9
index c680ee183cb..f61b2a329af 100644
@@ -11,14 +11,8 @@ SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cd
 
 inherit autotools
 
-# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of
-# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal
-EXTRA_AUTORECONF += " -I ${S}"
-
-do_configure_prepend() {
-        if [ ! -e ${S}/acinclude.m4 ]; then
-                cat ${S}/aclocal.m4 > ${S}/acinclude.m4
-        fi
-}
+# The nested configures don't find the parent aclocal.m4 out of the box, so tell
+# it where to look explicitly (mirroring the behaviour of upstream's Makefile.devel).
+EXTRA_AUTORECONF += " -I ${S} --exclude=aclocal"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.11.0