From 4a9deabbc8fb0b54e64b0a21af5bfb1527a9891d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Apr 2019 17:31:07 -0700 Subject: lcdproc: Fix parallel build This happens with larger parallelism e.g. -j 44 also reported here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=214766 Signed-off-by: Khem Raj --- ...l-build-fix-port-internal-make-dependenci.patch | 33 ++++++++++++++++++++++ meta-oe/recipes-extended/lcdproc/lcdproc_git.bb | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch (limited to 'meta-oe/recipes-extended') diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch new file mode 100644 index 0000000000..8505ea34c8 --- /dev/null +++ b/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch @@ -0,0 +1,33 @@ +From 67d808b8739817c122bed8ba1a8308d01cb5ad0b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Apr 2019 17:28:28 -0700 +Subject: [PATCH] Fix parallel build (fix port-internal make dependencies) on + many cores + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + server/drivers/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am +index 0c23a9b..6777047 100644 +--- a/server/drivers/Makefile.am ++++ b/server/drivers/Makefile.am +@@ -47,11 +47,11 @@ CwLnx_LDADD = libLCD.a libbignum.a + futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a + g15_LDADD = @LIBG15@ + glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@ +-glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o ++glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a + glcdlib_LDADD = @LIBGLCD@ + glk_LDADD = libbignum.a + hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a +-hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ ++hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a + i2500vfd_LDADD = @LIBFTDI_LIBS@ + imon_LDADD = libLCD.a libbignum.a + imonlcd_LDADD = libLCD.a +-- +2.21.0 + diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb index 1354997891..7ddc55f5e7 100644 --- a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb @@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ BASEPV = "0.5.9" PV = "${BASEPV}+git${SRCPV}" -SRCREV = "a4b5a7e058fdd0d914a61138748b589c0128b45b" +SRCREV = "e08546c13a4157ed98cd4a8e9086e7acd66f93c0" SRC_URI = "git://github.com/lcdproc/lcdproc \ + file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg