Message ID | 4112e251a7a4b3513c66ff30ac2f502b0aa2541c.1417022842.git.baruch@tkos.co.il |
---|---|
State | Accepted |
Commit | 05aa5b49739e528b85fcf3efbe8948a3db2ff09d |
Headers | show |
Dear Baruch Siach, On 11/26/2014 05:27 PM, Baruch Siach wrote: > Disable shared library in a static build. > > Fixes: > http://autobuild.buildroot.net/results/6ff/6ffae151ec3eaca175923ab860cf42167871164c/ > http://autobuild.buildroot.net/results/cab/cab19721c43b3256dd51ae511016bc9ea440512a/ > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > package/libnspr/libnspr.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk > index c071d8591fbd..1930870a5108 100644 > --- a/package/libnspr/libnspr.mk > +++ b/package/libnspr/libnspr.mk > @@ -21,6 +21,12 @@ LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME) > LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit > LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6 > > +ifeq ($(BR2_PREFER_STATIC_LIB),y) > +LIBNSPR_MAKE_OPTS = SHARED_LIBRARY= > +LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SHARED_LIBRARY= install > +LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) SHARED_LIBRARY= install > +endif > + > ifeq ($(BR2_arm),y) > ifeq ($(BR2_ARM_CPU_HAS_THUMB2),y) > LIBNSPR_CONF_OPTS += --enable-thumb2 > Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> $ grep PREFER_STATIC .config BR2_PREFER_STATIC_LIB=y $ grep UCLIBC .config BR2_TOOLCHAIN_USES_UCLIBC=y BR2_TOOLCHAIN_EXTERNAL_UCLIBC=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC=y # BR2_UCLIBC_VERSION_0_9_32 is not set $ grep LIBNSPR .config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y BR2_PACKAGE_LIBNSPR=y $ file output/staging/usr/lib/libnspr* output/staging/usr/lib/libnspr4.a It also fixes this autobuild failure for MIPS: http://autobuild.buildroot.net/results/691/6913f5af6519463fbed39ef37b6a40ecf6a67b54/ Best regards,
Baruch, All, On 2014-11-26 19:27 +0200, Baruch Siach spake thusly: > Disable shared library in a static build. > > Fixes: > http://autobuild.buildroot.net/results/6ff/6ffae151ec3eaca175923ab860cf42167871164c/ > http://autobuild.buildroot.net/results/cab/cab19721c43b3256dd51ae511016bc9ea440512a/ > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested with the config from 6ff/6ffae15 Regards, Yann E. MORIN. > --- > package/libnspr/libnspr.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk > index c071d8591fbd..1930870a5108 100644 > --- a/package/libnspr/libnspr.mk > +++ b/package/libnspr/libnspr.mk > @@ -21,6 +21,12 @@ LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME) > LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit > LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6 > > +ifeq ($(BR2_PREFER_STATIC_LIB),y) > +LIBNSPR_MAKE_OPTS = SHARED_LIBRARY= > +LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SHARED_LIBRARY= install > +LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) SHARED_LIBRARY= install > +endif > + > ifeq ($(BR2_arm),y) > ifeq ($(BR2_ARM_CPU_HAS_THUMB2),y) > LIBNSPR_CONF_OPTS += --enable-thumb2 > -- > 2.1.3 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > Disable shared library in a static build. > Fixes: > http://autobuild.buildroot.net/results/6ff/6ffae151ec3eaca175923ab860cf42167871164c/ > http://autobuild.buildroot.net/results/cab/cab19721c43b3256dd51ae511016bc9ea440512a/ > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Committed, thanks.
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index c071d8591fbd..1930870a5108 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -21,6 +21,12 @@ LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME) LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6 +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIBNSPR_MAKE_OPTS = SHARED_LIBRARY= +LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SHARED_LIBRARY= install +LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) SHARED_LIBRARY= install +endif + ifeq ($(BR2_arm),y) ifeq ($(BR2_ARM_CPU_HAS_THUMB2),y) LIBNSPR_CONF_OPTS += --enable-thumb2
Disable shared library in a static build. Fixes: http://autobuild.buildroot.net/results/6ff/6ffae151ec3eaca175923ab860cf42167871164c/ http://autobuild.buildroot.net/results/cab/cab19721c43b3256dd51ae511016bc9ea440512a/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- package/libnspr/libnspr.mk | 6 ++++++ 1 file changed, 6 insertions(+)