From: Kefu Chai <kchai@redhat.com>
Date: Mon, 6 Jun 2016 03:08:27 +0000 (+0800)
Subject: configure.ac,debian,rpm: do not package .a files in rpm/deb packages
X-Git-Tag: v11.0.0~262^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70bbf1aded87ae7f72ac653fab5ffa325bdf0f83;p=ceph.git

configure.ac,debian,rpm: do not package .a files in rpm/deb packages

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 <kchai@redhat.com>
---

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index db109a697ea4..080fe32b6db9 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -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.
\ No newline at end of file
diff --git a/ceph.spec.in b/ceph.spec.in
index 79bef540c389..10687fc893ed 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -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
diff --git a/configure.ac b/configure.ac
index aae791630382..b6453b187393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
 
 
diff --git a/debian/libcephfs-dev.install b/debian/libcephfs-dev.install
index 97ddfc7edea2..625c874ec146 100644
--- a/debian/libcephfs-dev.install
+++ b/debian/libcephfs-dev.install
@@ -1,3 +1,2 @@
 usr/include/cephfs/libcephfs.h
-usr/lib/libcephfs.a
 usr/lib/libcephfs.so
diff --git a/debian/librados-dev.install b/debian/librados-dev.install
index 1baf60aab04a..c3231c96bb2d 100644
--- a/debian/librados-dev.install
+++ b/debian/librados-dev.install
@@ -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
diff --git a/debian/libradosstriper-dev.install b/debian/libradosstriper-dev.install
index 14b8a124027a..f7986d30f2d7 100644
--- a/debian/libradosstriper-dev.install
+++ b/debian/libradosstriper-dev.install
@@ -1,4 +1,3 @@
 usr/include/radosstriper/libradosstriper.h
 usr/include/radosstriper/libradosstriper.hpp
-usr/lib/libradosstriper.a
 usr/lib/libradosstriper.so
diff --git a/debian/librbd-dev.install b/debian/librbd-dev.install
index ffdd1de1e2a4..dd0109a34274 100644
--- a/debian/librbd-dev.install
+++ b/debian/librbd-dev.install
@@ -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
diff --git a/debian/librgw-dev.install b/debian/librgw-dev.install
index c88a0a7ae877..ed2a81dba501 100644
--- a/debian/librgw-dev.install
+++ b/debian/librgw-dev.install
@@ -1,4 +1,3 @@
 usr/include/rados/librgw.h
 usr/include/rados/rgw_file.h
-usr/lib/librgw.a
 usr/lib/librgw.so