summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch34
-rw-r--r--meta-oe/recipes-extended/lprng/lprng_3.9.0.bb (renamed from meta-oe/recipes-extended/lprng/lprng_3.8.C.bb)6
2 files changed, 2 insertions, 38 deletions
diff --git a/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch b/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch
deleted file mode 100644
index 5748690445..0000000000
--- a/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 6358561d5bad34f0003ebd415142d504fe53045a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Aug 2020 11:42:08 -0700
4Subject: [PATCH] checkpc: Do not define Mail_fd multiple times
5
6Its also defines in var.c via lp.h this is flagged when -fno-common is
7used
8
9Fixes
10TOPDIR/build/tmp/work/core2-32-yoe-linux/lprng/3.8.C-r0/recipe-sysroot-native/usr/bin/i686-yoe-linux/i686-yoe-linux-ld: vars.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/include/lp.h:72: multiple definition of `Mail_fd'; checkpc.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/common/checkpc.c:35: first defined here
11clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/common/checkpc.c | 2 --
17 1 file changed, 2 deletions(-)
18
19diff --git a/src/common/checkpc.c b/src/common/checkpc.c
20index aa03b08..7334094 100644
21--- a/src/common/checkpc.c
22+++ b/src/common/checkpc.c
23@@ -32,8 +32,6 @@ static int Remove;
24 static char *User_specified_printer;
25 static time_t Current_time;
26 static int Check_path_list( char *plist, int allow_missing );
27-int Mail_fd;
28-
29
30 /* pathnames of the spool directory (sd) and control directory (cd) */
31
32--
332.28.0
34
diff --git a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb
index fd20860a03..04376b66ed 100644
--- a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
+++ b/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb
@@ -3,10 +3,8 @@ SECTION = "console/utils"
3LICENSE = "GPL-2.0-only | Artistic-1.0" 3LICENSE = "GPL-2.0-only | Artistic-1.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 6SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
7 file://0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch \ 7SRC_URI[sha256sum] = "c92597671f4c7cbe8bb3f38fbc4283354db84c6abff1efb675fa2e120421915d"
8 "
9SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10"
10 8
11UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/" 9UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/"
12UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 10UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"