diff mbox

[PATCHv2] e2fsprogs: Install libraries to staging

Message ID 1385661237-13975-1-git-send-email-daniel.nystrom@timeterminal.se
State Accepted
Commit 1ee98ea68fdf0767288914230031a18fbb2f9d55
Headers show

Commit Message

Daniel Nyström Nov. 28, 2013, 5:53 p.m. UTC
Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
---
 package/e2fsprogs/e2fsprogs.mk | 2 ++
 1 file changed, 2 insertions(+)

Comments

Thomas Petazzoni Nov. 28, 2013, 6:23 p.m. UTC | #1
Dear Daniel Nyström,

On Thu, 28 Nov 2013 18:53:57 +0100, Daniel Nyström wrote:
> Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
> ---
>  package/e2fsprogs/e2fsprogs.mk | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
> index 0670c74..31e671b 100644
> --- a/package/e2fsprogs/e2fsprogs.mk
> +++ b/package/e2fsprogs/e2fsprogs.mk
> @@ -8,6 +8,8 @@ E2FSPROGS_VERSION = 1.42.8
>  E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
>  E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
>  E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
> +E2FSPROGS_INSTALL_STAGING = YES
> +E2FSPROGS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-libs

I must say I'd like to know *why* the normal "install" rule does not
install the .pc file. It seems to install everything else, including
the libraries, but not the .pc file, for some reason.

Best regards,

Thomas
Arnout Vandecappelle Nov. 30, 2013, 9:26 p.m. UTC | #2
On 28/11/13 19:23, Thomas Petazzoni wrote:
> Dear Daniel Nyström,
>
> On Thu, 28 Nov 2013 18:53:57 +0100, Daniel Nyström wrote:
>> Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
>> ---
>>   package/e2fsprogs/e2fsprogs.mk | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
>> index 0670c74..31e671b 100644
>> --- a/package/e2fsprogs/e2fsprogs.mk
>> +++ b/package/e2fsprogs/e2fsprogs.mk
>> @@ -8,6 +8,8 @@ E2FSPROGS_VERSION = 1.42.8
>>   E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
>>   E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
>>   E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
>> +E2FSPROGS_INSTALL_STAGING = YES
>> +E2FSPROGS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-libs
>
> I must say I'd like to know *why* the normal "install" rule does not
> install the .pc file. It seems to install everything else, including
> the libraries, but not the .pc file, for some reason.

  I would actually prefer an (upstreamable) patch to e2fsprogs that fixes 
the install rule, rather than overriding the install commands.

  Regards,
  Arnout
Gustavo Zacarias Jan. 22, 2014, 1:08 p.m. UTC | #3
On 11/28/2013 02:53 PM, Daniel Nyström wrote:

> Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo Zacarias Jan. 22, 2014, 1:13 p.m. UTC | #4
On 11/28/2013 03:23 PM, Thomas Petazzoni wrote:
>> +E2FSPROGS_INSTALL_STAGING = YES
>> +E2FSPROGS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-libs
> 
> I must say I'd like to know *why* the normal "install" rule does not
> install the .pc file. It seems to install everything else, including
> the libraries, but not the .pc file, for some reason.

Fair enough, when calling install in the toplevel Makefile.in calling
install-libs has some conditions:

if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d
ext2ed ; then $(MAKE) install-libs ; fi

Since those directories exist install-libs is never called internally,
just install-shlibs-recursive which doesn't install the pc files.

My $.02 guess is that rule was written for e2fsprogs-libs which is the
recommended way to get the libs (blkid/et/quota/ss/uuid) since it lacks
those directories and has the same condition on the toplevel Makefile.in

It might be worth analyzing if we want to split, some distros do it that
way and it would reduce build times a bit in some scenarios.

Regards.
Peter Korsgaard Jan. 22, 2014, 8:45 p.m. UTC | #5
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > On 11/28/2013 02:53 PM, Daniel Nyström wrote:
 >> Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>

 > Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.
diff mbox

Patch

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 0670c74..31e671b 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -8,6 +8,8 @@  E2FSPROGS_VERSION = 1.42.8
 E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
 E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
 E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
+E2FSPROGS_INSTALL_STAGING = YES
+E2FSPROGS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-libs
 
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \