Bug#773300: Improve glibc bootstrap
- dh_shlibdeps -p$(curpass)
+ [ -n "$$(echo $(curpass) | grep 'mips32')" ] &&
o32_libs="-l$(CURDIR)/debian/$(curpass)/libo32/"; \
+ dh_shlibdeps $$o32_libs -p$(curpass)
This is due to on mips{n32,64}{el,}, o32 libraries are in (/usr)/libo32,
while they are not standard path, dh_shdeps will not look for in it.
So when $(curpass) includes mips32, we pass an option to it.
On Mon, May 11, 2015 at 6:49 AM, YunQiang Su <wzssyqa@gmail.com> wrote:
>
>> 在 2015年5月2日，上午4:52，YunQiang Su <wzssyqa@gmail.com> 写道：
>>
>> On Thu, 18 Dec 2014 23:44:33 +0800 YunQiang Su <wzssyqa@gmail.com> wrote:
>>> Sorry, forgot to attach the new patch.
>>>
>>> On Thu, Dec 18, 2014 at 11:44 PM, YunQiang Su <wzssyqa@gmail.com> wrote:
>>>> Thank you for pointing them out.
>>>>
>>>> On Wed, Dec 17, 2014 at 3:10 AM, Helmut Grohne <helmut@subdivi.de> wrote:
>>>>> On Tue, Dec 16, 2014 at 11:39:40PM +0800, YunQiang Su wrote:
>>>>>> Hi, the attached patch can improve bootstrapping of glibc.
>>>>>
>>>>> Partially, this seems to be a duplicate of #766877. Maybe these should
>>>>> be merged?
>>>>>
>>>>>> It produces the similiar stage1 glibc
>>>>>> (libc6/libc6-dev and multilib version of them),
>>>>>> at the same time, the dependencies of them are also correct.
>>>>>
>>>>> The documentation and rationale of this patch are scarce. I have a few
>>>>> comments on individual hunks though.
>>>>>
>>>>> diff -Nru glibc-2.19/debian/rules glibc-2.19/debian/rules
>>>>> --- glibc-2.19/debian/rules 2014-10-17 07:43:19.000000000 +0000
>>>>> +++ glibc-2.19/debian/rules 2014-12-10 23:16:28.000000000 +0000
>>>>> @@ -143,8 +143,12 @@
>>>>> endif
>>>>> endif
>>>>>
>>>>> +ifeq ($(DEB_STAGE),stage2)
>>>>> + DEB_BUILD_PROFILES+=stage2
>>>>> +endif
>>>>> +
>>>>> ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
>>>>> - DEB_ARCH_REGULAR_PACKAGES = $(libc)-dev
>>>>> + DEB_ARCH_REGULAR_PACKAGES = $(libc)-dev $(libc)
>>>>> DEB_INDEP_REGULAR_PACKAGES =
>>>>> DEB_UDEB_PACKAGES =
>>>>> else
>>>>>
>>>>> I have no clue how one would build the libc in stage1. The gcc stage1
>>>>> does not provide the means for doing so. If anything those packages
>>>>> would be empty. I.e. this seems rather wrong to me.
>>>>
>>>> Yes, it is a empty package and are used only for meeting dependency.
>>>> It is only for stage1, and it can make things simple.
>>>> I don't treat it as a problem.
>>>>
>>>>>
>>>>> diff -Nru glibc-2.19/debian/sysdeps/linux.mk glibc-2.19/debian/sysdeps/linux.mk
>>>>> --- glibc-2.19/debian/sysdeps/linux.mk 2014-07-16 18:43:31.000000000 +0000
>>>>> +++ glibc-2.19/debian/sysdeps/linux.mk 2014-12-10 23:11:05.000000000 +0000
>>>>> @@ -16,11 +16,7 @@
>>>>> endif
>>>>>
>>>>> ifndef LINUX_SOURCE
>>>>> - ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
>>>>> - LINUX_HEADERS := /usr/include
>>>>> - else
>>>>> - LINUX_HEADERS := /usr/$(DEB_HOST_GNU_TYPE)/include
>>>>> - endif
>>>>> + LINUX_HEADERS := /usr/include
>>>>> LINUX_ARCH_HEADERS := /usr/include/$(DEB_HOST_MULTIARCH)
>>
>>
>> I dropped the changes for debian/sysdep/mips*.mk.
>> They are not needed.
>>
>> And if use mv, it will make '-mabi=32' fail.
>> <glibc.debdiff>
>
> This is the patch updated for 2.21.
>
>
>
--
YunQiang Su
Reply to: