Skip to content

Commit

Permalink
configure.ac,debian,rpm: do not package .a files in rpm/deb packages
Browse files Browse the repository at this point in the history
this change removes *.a from -dev or -devel packages.

* configure.ac:
  - use LT_INIT instead of AM_PROG_LIBTOOL. the later is deprecated.
  - disable static lib:
    .a static libraries not not useful, it's tricky to generate both
    static libraries and shared libraries in cmake.
    see http://www.spinics.net/lists/ceph-devel/msg30637.html
* ceph.spec.in: fedora packaging policy forbids this
  see
  https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries
* debian/*-dev.install: debian does not requires this
  see
  https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-sharedlibs-static

Signed-off-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov committed Jun 7, 2016
1 parent 4ba2bb7 commit 70bbf1a
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 7 deletions.
10 changes: 10 additions & 0 deletions PendingReleaseNotes
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,13 @@

* The `osd crush location` config option is no longer supported. Please
update your ceph.conf to use the `crush location` option instead.

* The static libraries are not included by the debian development packages
(lib*-dev) any more. As it is not required per debian packaging policy.
And their shared versions are packaged as before.

* The libtool pseudo-libraries (.la files) are not included by the debian
development packages (lib*-dev) any more. As it is unneeded, and per
https://wiki.debian.org/ReleaseGoals/LAFileRemoval and
https://www.debian.org/doc/manuals/maint-guide/advanced.en.html,
we should remove them.
1 change: 0 additions & 1 deletion ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,6 @@ make %{?_smp_mflags} check
%install
make DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
install -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
%if 0%{?fedora} || 0%{?rhel}
install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

# Automake
AM_PROG_CC_C_O
AM_PROG_LIBTOOL
LT_INIT([disable-static])
AM_PROG_AS


Expand Down
1 change: 0 additions & 1 deletion debian/libcephfs-dev.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
usr/include/cephfs/libcephfs.h
usr/lib/libcephfs.a
usr/lib/libcephfs.so
1 change: 0 additions & 1 deletion debian/librados-dev.install
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ usr/include/rados/page.h
usr/include/rados/rados_types.h
usr/include/rados/rados_types.hpp
usr/include/rados/memory.h
usr/lib/librados.a
usr/lib/librados.so
usr/share/man/man8/librados-config.8
1 change: 0 additions & 1 deletion debian/libradosstriper-dev.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
usr/include/radosstriper/libradosstriper.h
usr/include/radosstriper/libradosstriper.hpp
usr/lib/libradosstriper.a
usr/lib/libradosstriper.so
1 change: 0 additions & 1 deletion debian/librbd-dev.install
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
usr/include/rbd/features.h
usr/include/rbd/librbd.h
usr/include/rbd/librbd.hpp
usr/lib/librbd.a
usr/lib/librbd.so
1 change: 0 additions & 1 deletion debian/librgw-dev.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
usr/include/rados/librgw.h
usr/include/rados/rgw_file.h
usr/lib/librgw.a
usr/lib/librgw.so

0 comments on commit 70bbf1a

Please sign in to comment.