From: Wang Mingyu <[email protected]> 0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch removed since it's included in 3.9.0
Signed-off-by: Wang Mingyu <[email protected]> --- ...Do-not-define-Mail_fd-multiple-times.patch | 34 ------------------- .../lprng/{lprng_3.8.C.bb => lprng_3.9.0.bb} | 6 ++-- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch rename meta-oe/recipes-extended/lprng/{lprng_3.8.C.bb => lprng_3.9.0.bb} (78%) 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 @@ -From 6358561d5bad34f0003ebd415142d504fe53045a Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 13 Aug 2020 11:42:08 -0700 -Subject: [PATCH] checkpc: Do not define Mail_fd multiple times - -Its also defines in var.c via lp.h this is flagged when -fno-common is -used - -Fixes -TOPDIR/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 -clang-11: error: linker command failed with exit code 1 (use -v to see invocation) - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/common/checkpc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/common/checkpc.c b/src/common/checkpc.c -index aa03b08..7334094 100644 ---- a/src/common/checkpc.c -+++ b/src/common/checkpc.c -@@ -32,8 +32,6 @@ static int Remove; - static char *User_specified_printer; - static time_t Current_time; - static int Check_path_list( char *plist, int allow_missing ); --int Mail_fd; -- - - /* pathnames of the spool directory (sd) and control directory (cd) */ - --- -2.28.0 - diff --git a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb similarity index 78% rename from meta-oe/recipes-extended/lprng/lprng_3.8.C.bb rename to 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" LICENSE = "GPL-2.0-only | Artistic-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch \ - " -SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "c92597671f4c7cbe8bb3f38fbc4283354db84c6abff1efb675fa2e120421915d" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/"; UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121818): https://lists.openembedded.org/g/openembedded-devel/message/121818 Mute This Topic: https://lists.openembedded.org/mt/116353482/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
