deleted file mode 100644
@@ -1,39 +0,0 @@
-From a9b7e07a8ba9c390d9774daae769748a09d409ce Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 1 May 2021 14:41:21 -0700
-Subject: [PATCH] Honor DESTDIR variable during install
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Makefile.in | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6397bf1..8395d2f 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -78,16 +78,16 @@ gnurx.lib: libgnurx-$(DLLVERSION).dll
- install: install-dll @install_dev@
-
- install-dll:
-- mkdir -p ${bindir}
-- cp -p $(BINDIST_FILES) ${bindir}
-+ mkdir -p $(DESTDIR)${bindir}
-+ cp -p $(BINDIST_FILES) $(DESTDIR)${bindir}
-
- install-dev:
-- mkdir -p ${includedir} ${libdir}
-- cp -p ${srcdir}/regex.h ${includedir}
-- cp -p $(DEVDIST_FILES) ${libdir}
-+ mkdir -p ${includedir} $(DESTDIR)${libdir}
-+ cp -p ${srcdir}/regex.h $(DESTDIR)${includedir}
-+ cp -p $(DEVDIST_FILES) $(DESTDIR)${libdir}
- for s in 3 7; do \
-- mkdir -p ${mandir}/man$$s; \
-- gzip -c ${srcdir}/regex.$$s > ${mandir}/man$$s/regex.$$s.gz; \
-+ mkdir -p $(DESTDIR)${mandir}/man$$s; \
-+ gzip -c ${srcdir}/regex.$$s > $(DESTDIR)${mandir}/man$$s/regex.$$s.gz; \
- done
-
- dist: bindist devdist srcdist
@@ -22,7 +22,7 @@ index 0000000..be0a797
+lib_LTLIBRARIES = libgnurx.la
+
+libgnurx_la_SOURCES = regex.c
-+libgnurx_la_includedir = $(includedir)
++libgnurx_la_includedir = $(includedir)/mingw-libgnurx
+libgnurx_la_include_HEADERS = regex.h
+libgnurx_la_CFLAGS = -I$(top_srcdir)
+libgnurx_la_LDFLAGS = -no-undefined -version-info 0:0:0 -export-dynamic
@@ -4,7 +4,6 @@ LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
SRC_URI = "http://download.sourceforge.net/mingw/Other/UserContributed/regex/mingw-regex-${PV}/mingw-libgnurx-${PV}-src.tar.gz \
- file://0001-Honor-DESTDIR-variable-during-install.patch \
file://0002-Add-autotool-files.patch \
"
SRC_URI[sha256sum] = "7147b7f806ec3d007843b38e19f42a5b7c65894a57ffc297a76b0dcd5f675d76"
1. Both of glibc and mingw-libgnurx's dev package provides /usr/include/regex.h, and mingw-libgnurx-dev depends on glibc-dev. So install mingw-libgnurx-dev failed root@x86-64:~# rpm -qlp libc6-dev-2.37-r1.0.x86_64.rpm | grep regex.h /usr/include/regex.h root@x86-64:~# rpm -qlp libgnurx-dev-2.5.1-r0.0.x86_64.rpm |grep regex.h /usr/include/regex.h root@x86-64:~# rpm-ostree install mingw-libgnurx-dev rpm-ostree install: error: Checkout libgnurx-dev-2.5.1-r0.8.x86_64: Hardlinking 0e/39f3fcd99b0db7455336559927b51bb413067abd030785662c3ff9aefa4c22.file to regex.h: File exists Move /usr/include/regex.h of mingw-libgnurx-dev to /usr/include/mingw-libgnurx/regex.h 2. Due to autotool is used, drop 0001-Honor-DESTDIR-variable-during-install.patch to modify Makefile.in Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- ...onor-DESTDIR-variable-during-install.patch | 39 ------------------- .../0002-Add-autotool-files.patch | 2 +- .../mingw-libgnurx/mingw-libgnurx_2.5.1.bb | 1 - 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 recipes-support/mingw-libgnurx/mingw-libgnurx/0001-Honor-DESTDIR-variable-during-install.patch