[packages/linux-musl-headers] - top-level musl include dirs are owned by musl-devel; R: musl-devel for dirs and some headers

qboosh qboosh at pld-linux.org
Wed Jun 15 17:27:02 CEST 2022


commit a9565f37a7dc1ab465e2175951f28b09a3fcedf6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jun 15 17:28:21 2022 +0200

    - top-level musl include dirs are owned by musl-devel; R: musl-devel for dirs and some headers

 linux-musl-headers.spec | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/linux-musl-headers.spec b/linux-musl-headers.spec
index 457a873..90b1e45 100644
--- a/linux-musl-headers.spec
+++ b/linux-musl-headers.spec
@@ -15,6 +15,7 @@ BuildRequires:	glibc-devel
 BuildRequires:	rpmbuild(macros) >= 1.568
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+Requires:	musl-devel
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,13 +54,14 @@ z biblioteką musl.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	prefix=%{_prefix}-musl \
 	DESTDIR=$RPM_BUILD_ROOT \
 	ARCH=%{target_arch}
 
 install -d $RPM_BUILD_ROOT%{_includedir}
-mv $RPM_BUILD_ROOT%{_prefix}-musl/include $RPM_BUILD_ROOT%{_includedir}/musl
+%{__mv} $RPM_BUILD_ROOT%{_prefix}-musl/include $RPM_BUILD_ROOT%{_includedir}/musl
 
 # hack to provide missing headers that are compatible with musl
 install -d $RPM_BUILD_ROOT%{_includedir}/musl/sys
@@ -70,4 +72,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_includedir}/musl
+%{_includedir}/musl/asm
+%{_includedir}/musl/asm-generic
+%{_includedir}/musl/drm
+%{_includedir}/musl/linux
+%{_includedir}/musl/mtd
+%{_includedir}/musl/rdma
+%{_includedir}/musl/scsi/cxlflash_ioctl.h
+%{_includedir}/musl/scsi/scsi_bsg_fc.h
+%{_includedir}/musl/scsi/scsi_netlink*.h
+%{_includedir}/musl/scsi/fc
+%{_includedir}/musl/sound
+# this one should belong to musl-devel probably
+%{_includedir}/musl/sys/queue.h
+%{_includedir}/musl/video
+%{_includedir}/musl/xen
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-musl-headers.git/commitdiff/a9565f37a7dc1ab465e2175951f28b09a3fcedf6



More information about the pld-cvs-commit mailing list