Message ID | 516BC3BC.5040100@fh-kl.de |
---|---|
State | Accepted |
Commit | 79154f49f5c6fa15e5500df048ff829f25e6d3f7 |
Headers | show |
On 15/04/13 11:09, Patrick Ziegler wrote: > Don't change the busybox STATIC option if buildroots PREFER_STATIC_LIB option > is not set. Not to prefer static linking doesn't imply prefer dynamic linking > for all packages. > > Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > package/busybox/busybox.mk | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index 900896f..985203c 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -106,10 +106,6 @@ ifeq ($(BR2_PREFER_STATIC_LIB),y) > define BUSYBOX_PREFER_STATIC > $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) > endef > -else > -define BUSYBOX_PREFER_STATIC > - $(call KCONFIG_DISABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) > -endef > endif > > # Disable usage of inetd if netkit-base package is selected >
>>>>> "Patrick" == Patrick Ziegler <patrick.ziegler@fh-kl.de> writes:
Patrick> Don't change the busybox STATIC option if buildroots
Patrick> PREFER_STATIC_LIB option is not set. Not to prefer static
Patrick> linking doesn't imply prefer dynamic linking for all packages.
Committed, thanks.
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 900896f..985203c 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -106,10 +106,6 @@ ifeq ($(BR2_PREFER_STATIC_LIB),y) define BUSYBOX_PREFER_STATIC $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) endef -else -define BUSYBOX_PREFER_STATIC - $(call KCONFIG_DISABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) -endef endif # Disable usage of inetd if netkit-base package is selected
Don't change the busybox STATIC option if buildroots PREFER_STATIC_LIB option is not set. Not to prefer static linking doesn't imply prefer dynamic linking for all packages. Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de> --- package/busybox/busybox.mk | 4 ---- 1 file changed, 4 deletions(-)