Bug#772665: produces broken cross compiler packages for mips64el
On Thu, Dec 11, 2014 at 4:57 PM, Matthias Klose <doko@debian.org> wrote:
> On 12/11/2014 09:35 AM, YunQiang Su wrote:
>> I believe that it should be just a workaround in the dark age that
>> control.m4 cannot process some triarch situation.
>> Now we have control.m4 workable, so I believe that we can remove them.
>>
>> It was used by with_deps_on_target_arch_pkgs only, so it is useless now.
>> You can remove these lines.
>
> Please could you verify that, and attach a build log of such a triarch cross build?
>
In recent modifications:
ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el
mipsn32 mipsn32el))
- ifneq ($(with_deps_on_target_arch_pkgs),yes)
- define cross_mangle_control
+ define cross_mangle_control
$(if $(findstring lib64,$(1)),sed -i -r
'/^(Dep|Rec|Sug)/s/[a-z0-9-]+32[^$(COMMA)]+($(COMMA)
*|$$)//g;/^(Dep|Rec|Sug)/s/$(p_lgcc)/$(p_l64gcc)/;/^(Dep|Rec|Sug)/s/
*$(COMMA) *$$//' debian/$(1)/DEBIA
N/control,@:)
$(if $(findstring libn32,$(1)),sed -i -r
'/^(Dep|Rec|Sug)/s/[a-z0-9-]+64[^$(COMMA)]+($(COMMA)
*|$$)//g;/^(Dep|Rec|Sug)/s/$(p_lgcc)/$(p_ln32gcc)/;/^(Dep|Rec|Sug)/s/
*$(COMMA) *$$//' debian/$(1)/DEBIAN/control,@:)
- endef
- else
- define cross_mangle_control
- endef
- endif
+ endef
You removed with_deps_on_target_arch_pkgs condition before it.
It was used only when with_deps_on_target_arch_pkgs set, and also now when
with_deps_on_target_arch_pkgs set, it is also useless.
--
YunQiang Su
Reply to: