From 665e13c85e1fd216499cdd335a88a4d1c20f175f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 3 Dec 2014 22:41:29 +0100 Subject: Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed from "prefer static libraries when possible" to "use only static libraries". The former semantic didn't make much sense, since the user had absolutely no control/idea of which package would use static libraries, and which packages would not. Therefore, for quite some time, we have been starting to enforce that BR2_PREFER_STATIC_LIB should really build everything with static libraries. As a consequence, this patch renames BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS, and adjust the Config.in option accordingly. This also helps preparing the addition of other options to select shared, shared+static or just static. Note that we have verified that this commit can be reproduced by simply doing a global rename of BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- support/scripts/scancpan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'support/scripts/scancpan') diff --git a/support/scripts/scancpan b/support/scripts/scancpan index 590c2153de..d2e0563094 100755 --- a/support/scripts/scancpan +++ b/support/scripts/scancpan @@ -632,7 +632,7 @@ while (my ($distname, $dist) = each %dist) { open my $fh, q{>}, $cfgname; say {$fh} qq{config BR2_PACKAGE_${brname}}; say {$fh} qq{\tbool "${fsname}"}; - say {$fh} qq{\tdepends on !BR2_PREFER_STATIC_LIB} if $need_dlopen{$distname}; + say {$fh} qq{\tdepends on !BR2_STATIC_LIBS} if $need_dlopen{$distname}; foreach my $dep (sort @{$deps_runtime{$distname}}) { my $brdep = brname( fsname( $dep ) ); say {$fh} qq{\tselect BR2_PACKAGE_${brdep}}; @@ -642,7 +642,7 @@ while (my ($distname, $dist) = each %dist) { say {$fh} qq{\t ${homepage}}; if ($need_dlopen{$distname}) { say {$fh} qq{\ncomment "${fsname} needs a toolchain w/ dynamic library"}; - say {$fh} qq{\tdepends on BR2_PREFER_STATIC_LIB}; + say {$fh} qq{\tdepends on BR2_STATIC_LIBS}; } close $fh; } -- cgit v1.2.3