Skip to content

Commit

Permalink
Only build static library (#6)
Browse files Browse the repository at this point in the history
Signed-off-by: Jeff Olivier <[email protected]>
  • Loading branch information
jolivier23 authored Jan 11, 2025
1 parent 1afbef2 commit b51500d
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 24 deletions.
8 changes: 7 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
fused (1.0.0-1) unstable; urgency=medium
fused (1.0.0-2) unstable; urgency=medium
[ Jeff Olivier ]
* Change to static only

-- Jeff Olivier <[email protected]> Sat, 11 Jan 2025 08:09:00 +0000


fused (1.0.0-1) unstable; urgency=medium
[ Jeff Olivier ]
* Initial version

Expand Down
9 changes: 1 addition & 8 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,8 @@ Homepage: https://daos.io
Vcs-Browser: https://github.com/daos-stack/fused.git
Vcs-Git: https://github.com/daos-stack/fused.git

Package: libfused
Section: libdevel
Architecture: any
Multi-Arch: same
Description: Runtime binaries for DAOS FUSE library

Package: libfused-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Description: Development binaries and headers for DAOS FUSE library
Depends: libfused
Description: Headers and static library for DAOS FUSE library
3 changes: 1 addition & 2 deletions debian/libfused-dev.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
usr/include
usr/lib/*/pkgconfig
usr/lib/*/*.so
usr/lib
1 change: 0 additions & 1 deletion debian/libfused.install

This file was deleted.

4 changes: 2 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ override_dh_auto_clean:
dh_auto_clean

override_dh_auto_configure:
dh_auto_configure -- -Ddisable-mtab=True -Dutils=False --default-library shared \
dh_auto_configure -- -Ddisable-mtab=True -Dutils=False --default-library static \
--libdir=/usr/lib/${DEB_BUILD_MULTIARCH} --prefix=/usr

override_dh_missing:
Expand All @@ -26,4 +26,4 @@ override_dh_missing:
dh ${@} --buildsystem=meson

.PHONY: override_dh_auto_clean override_dh_auto_configure \
override_dh_missing override_dh_auto_test
override_dh_missing override_dh_auto_test override_dh_install
2 changes: 1 addition & 1 deletion fused.rpmlintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This line is mandatory to access the configuration functions
from Config import *

addFilter('fused.x86_64: W: no-documentation')
addFilter('fused-devel.x86_64: E: static-library-without-debuginfo /usr/lib64/libfused.a')
addFilter('fused-devel.x86_64: W: no-documentation')
# https://github.com/rpm-software-management/rpmlint/issues/856
addFilter('W: incoherent-version-in-changelog')
19 changes: 10 additions & 9 deletions fused.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: fused
Version: 1.0.0
Release: 1%{?relval}%{?dist}
Release: 2%{?relval}%{?dist}
Summary: DAOS File System in Userspace Library

License: LGPLv2+
Expand All @@ -17,37 +17,38 @@ This package builds on FUSE but implements a completely custom file
system intended for use with the DAOS file system.

%package devel
Summary: DAOS File System in Userspace based on (FUSE) v3 libraries and headers
Summary: DAOS file system development files
Group: System Environment/Libraries
License: LGPLv2+
Conflicts: filesystem < 3
Requires: %{name}%{?_isa} = %{version}-%{release}

%description devel
Provides a user space library and headers for DAOS specific FUSE filesystem

%global debug_package %{nil}

%description devel
Static library, pkgconfig, and headers for DAOS FUSE library

%prep
%autosetup

%build
%meson --strip -Ddisable-mtab=True -Dutils=False --default-library shared
%meson --strip -Ddisable-mtab=True -Dutils=False --default-library static
%meson_build

%install
export MESON_INSTALL_DESTDIR_PREFIX=%{buildroot}/usr %meson_install
find %{buildroot} .
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'

%files
%{_libdir}/libfused.so.*

%files devel
%{_libdir}/libfused.so
%{_libdir}/libfused.a
%{_includedir}/fused/
%{_libdir}/pkgconfig

%changelog
* Sat Jan 11 2025 Jeff Olivier <[email protected]> - 1.0.0-2.0
- Only build static lib

* Mon Feb 12 2024 Jeff Olivier <[email protected]> - 1.0.0-1.0
- Initial packaging for fused, a DAOS file system adaptation of libfused

0 comments on commit b51500d

Please sign in to comment.