Re: cygport 0.36.8-1

Re: cygport 0.36.8-1

[Christian Franke]

[-- Attachment #1: Type: text/plain, Size: 1051 bytes --]

Jon Turney wrote on cygwin-announce list:
>
> The following packages have been uploaded to the Cygwin distribution:
>
> * cygport-0.36.8-1
>
> cygport is the standard method for building and maintaining packages 
> for the Cygwin distribution.
>
>> ...
>>       Add initial support for SOURCE_DATE_EPOCH

Testcase with Cygwin 3.5.0-1 src package:
- using current non-test packages including g++ 11.4.0, but
- binutils needs to be downgraded to 2.41-3 (see my related recent post 
on this list)

Then this command apparently produces reproducible packages:

   cd /usr/src/cygwin-3.5.0-1.src &&
   SOURCE_DATE_EPOCH=1704974400 cygport ./cygwin.cygport all

This requires that always the same build directory is used. I attached 
the package checksums in case someone is willing to repeat the test.

It also worked with the following of my packages, regardless of build 
directory:
busybox-1.36.1-1, ddrescue-1.28-1, smartmontools-7.4-1
(busybox and smartmontools have SOURCE_DATE_EPOCH already set in the 
cygport file)

-- 
Regards,
Christian


[-- Attachment #2: cygwin-3.5.0-1_SDE-1704974400.md5 --]
[-- Type: text/plain, Size: 1020 bytes --]

b4362a4df2688819e34555173c5f843f *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-3.5.0-1-src.hint
17c671cf6fd3f96cca4b7c411bf5c893 *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-3.5.0-1-src.tar.xz
4d114538888011e43fd0e97fdba04fbf *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-3.5.0-1.hint
1b97eefb0a3ee5606076dd12abe00ae1 *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-3.5.0-1.tar.xz
bd8cfd72f3cffeada421debc9ac06f01 *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-debuginfo/cygwin-debuginfo-3.5.0-1.hint
ca80ee415c134c691a5edc2cb5cc6507 *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-debuginfo/cygwin-debuginfo-3.5.0-1.tar.xz
1fcf6f79fc6bb1e05eb7c45fcf9c157e *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-devel/cygwin-devel-3.5.0-1.hint
a5255ae6047d9d7e4a97503f1b708696 *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-devel/cygwin-devel-3.5.0-1.tar.xz
b761a8949c7e843d43eb97375be53576 *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-doc/cygwin-doc-3.5.0-1.hint
06ce0286241c7404a02c1d094cf7e33c *cygwin-3.5.0-1.x86_64/dist/cygwin/cygwin-doc/cygwin-doc-3.5.0-1.tar.xz

Re: cygport 0.36.8-1

[ASSI]

Christian Franke via Cygwin writes:
> This requires that always the same build directory is used.

Would that be solvable by using -ffile-prefix-map or is there more to
it?


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada

Re: cygport 0.36.8-1

[Jon Turney]

On 12/02/2024 16:49, ASSI via Cygwin wrote:
> Christian Franke via Cygwin writes:
>> This requires that always the same build directory is used.
> 
> Would that be solvable by using -ffile-prefix-map or is there more to
> it?

That should now be used in 0.36.8, so something else leaking the local 
build directory into the package, perhaps.

Re: cygport 0.36.8-1

[Christian Franke]

Jon Turney via Cygwin wrote:
> On 12/02/2024 16:49, ASSI via Cygwin wrote:
>> Christian Franke via Cygwin writes:
>>> This requires that always the same build directory is used.
>>
>> Would that be solvable by using -ffile-prefix-map or is there more to
>> it?
>
> That should now be used in 0.36.8, so something else leaking the local 
> build directory into the package, perhaps

A closer look shows that (only) the pathnames of the assembly (*.S) 
files in cygwin1.dll.dbg now contain the build path instead of the 
mapped path:

$ strings cygwin1.dll.dbg | grep '^/.*bcopy\.S$' | uniq
/tmp/build/cygwin-3.5.0-1.x86_64/src/newlib-cygwin/winsup/cygwin/x86_64/bcopy.S

The paths in the released package are correct:

$ strings /usr/lib/debug/usr/bin/cygwin1.dll.dbg | grep '^/.*bcopy\.S$' 
| uniq
/usr/src/debug/cygwin-3.5.0-1/winsup/cygwin/x86_64/bcopy.S

The regression was introduced by cygport commit 9e82685 in conjunction 
with the fact that --file-prefix-map has no effect on *.S files:

Testcase:

$ cygcheck -f /bin/as
binutils-2.42-1

$ cygcheck -f /bin/gcc
gcc-core-11.4.0-1

$ pwd
/tmp/build

$ echo ret > a.S

$ echo > c.c

$ gcc -c -g --file-prefix-map=/tmp/build=/foo/bar a.S c.c

$ strings -f *.o | grep ': /' | uniq
a.o: /tmp/build
c.o: /foo/bar

$ gcc -c -g --debug-prefix-map=/tmp/build=/foo/bar a.S c.c

$ strings -f *.o | grep ': /' | uniq
a.o: /foo/bar
c.o: /foo/bar

Also gcc builtin specs show that --file-prefix-map is not handled for asm:

$ gcc -dumpspecs | fgrep -A1 '*asm_debug:'
*asm_debug:
%{%:debug-level-gt(0):%{gstabs*:--gstabs;:%{g*:}}} 
%{fdebug-prefix-map=*:--debug-prefix-map %*}

-- 
Regards,
Christian

Re: cygport 0.36.8-1

[Jon Turney]

On 13/02/2024 13:02, Christian Franke via Cygwin wrote:
> Jon Turney via Cygwin wrote:
>> On 12/02/2024 16:49, ASSI via Cygwin wrote:
>>> Christian Franke via Cygwin writes:
>>>> This requires that always the same build directory is used.
>>>
>>> Would that be solvable by using -ffile-prefix-map or is there more to
>>> it?
>>
>> That should now be used in 0.36.8, so something else leaking the local 
>> build directory into the package, perhaps
> 
> A closer look shows that (only) the pathnames of the assembly (*.S) 
> files in cygwin1.dll.dbg now contain the build path instead of the 
> mapped path:
> 
> $ strings cygwin1.dll.dbg | grep '^/.*bcopy\.S$' | uniq
> /tmp/build/cygwin-3.5.0-1.x86_64/src/newlib-cygwin/winsup/cygwin/x86_64/bcopy.S
> 
> The paths in the released package are correct:
> 
> $ strings /usr/lib/debug/usr/bin/cygwin1.dll.dbg | grep '^/.*bcopy\.S$' 
> | uniq
> /usr/src/debug/cygwin-3.5.0-1/winsup/cygwin/x86_64/bcopy.S
> 
> The regression was introduced by cygport commit 9e82685 in conjunction 
> with the fact that --file-prefix-map has no effect on *.S files:

Great.  I guess that means we need to use both options.

> 
> Also gcc builtin specs show that --file-prefix-map is not handled for asm:
> 
> $ gcc -dumpspecs | fgrep -A1 '*asm_debug:'
> *asm_debug:
> %{%:debug-level-gt(0):%{gstabs*:--gstabs;:%{g*:}}} 
> %{fdebug-prefix-map=*:--debug-prefix-map %*}
> 

This kind of seems like a bug.

Re: cygport 0.36.8-1

[Christian Franke]

Jon Turney via Cygwin wrote:
> On 13/02/2024 13:02, Christian Franke via Cygwin wrote:
>> Jon Turney via Cygwin wrote:
>>> On 12/02/2024 16:49, ASSI via Cygwin wrote:
>>>> Christian Franke via Cygwin writes:
>>>>> This requires that always the same build directory is used.
>>>>
>>>> Would that be solvable by using -ffile-prefix-map or is there more to
>>>> it?
>>>
>>> That should now be used in 0.36.8, so something else leaking the 
>>> local build directory into the package, perhaps
>>
>> A closer look shows that (only) the pathnames of the assembly (*.S) 
>> files in cygwin1.dll.dbg now contain the build path instead of the 
>> mapped path:
>>
>> $ strings cygwin1.dll.dbg | grep '^/.*bcopy\.S$' | uniq
>> /tmp/build/cygwin-3.5.0-1.x86_64/src/newlib-cygwin/winsup/cygwin/x86_64/bcopy.S 
>>
>>
>> The paths in the released package are correct:
>>
>> $ strings /usr/lib/debug/usr/bin/cygwin1.dll.dbg | grep 
>> '^/.*bcopy\.S$' | uniq
>> /usr/src/debug/cygwin-3.5.0-1/winsup/cygwin/x86_64/bcopy.S
>>
>> The regression was introduced by cygport commit 9e82685 in 
>> conjunction with the fact that --file-prefix-map has no effect on *.S 
>> files:
>
> Great.  I guess that means we need to use both options.
>
>>
>> Also gcc builtin specs show that --file-prefix-map is not handled for 
>> asm:
>>
>> $ gcc -dumpspecs | fgrep -A1 '*asm_debug:'
>> *asm_debug:
>> %{%:debug-level-gt(0):%{gstabs*:--gstabs;:%{g*:}}} 
>> %{fdebug-prefix-map=*:--debug-prefix-map %*}
>>
>
> This kind of seems like a bug.
>

It is fixed in current gcc test release:

$ cygcheck -f /bin/gcc
gcc-core-13.2.1+20240203-0.1

$ gcc -dumpspecs | fgrep -A1 '*asm_debug:'
*asm_debug:
%{g*:%{%:debug-level-gt(0):}} %{ffile-prefix-map=*:--debug-prefix-map 
%*} %{fdebug-prefix-map=*:--debug-prefix-map %*}

Re: cygport 0.36.8-1

[Christian Franke]

Jon Turney via Cygwin wrote:
> On 13/02/2024 13:02, Christian Franke via Cygwin wrote:
>> Jon Turney via Cygwin wrote:
>>> On 12/02/2024 16:49, ASSI via Cygwin wrote:
>>>> Christian Franke via Cygwin writes:
>>>>> This requires that always the same build directory is used.
>>>>
>>>> Would that be solvable by using -ffile-prefix-map or is there more to
>>>> it?
>>>
>>> That should now be used in 0.36.8, so something else leaking the 
>>> local build directory into the package, perhaps
>>
>> A closer look shows that (only) the pathnames of the assembly (*.S) 
>> files in cygwin1.dll.dbg now contain the build path instead of the 
>> mapped path:
>>
>> $ strings cygwin1.dll.dbg | grep '^/.*bcopy\.S$' | uniq
>> /tmp/build/cygwin-3.5.0-1.x86_64/src/newlib-cygwin/winsup/cygwin/x86_64/bcopy.S 
>>
>>
>> The paths in the released package are correct:
>>
>> $ strings /usr/lib/debug/usr/bin/cygwin1.dll.dbg | grep 
>> '^/.*bcopy\.S$' | uniq
>> /usr/src/debug/cygwin-3.5.0-1/winsup/cygwin/x86_64/bcopy.S
>>
>> The regression was introduced by cygport commit 9e82685 in 
>> conjunction with the fact that --file-prefix-map has no effect on *.S 
>> files:
>
> Great.  I guess that means we need to use both options.

If both --file-prefix-map and --debug-prefix-map are used in cygport, 
Cygwin 3.5.0-1 build is apparently reproducible.regardless of build path.

Re: cygport 0.36.8-1

[ASSI]

Christian Franke via Cygwin writes:
> It is fixed in current gcc test release:
>
> $ cygcheck -f /bin/gcc
> gcc-core-13.2.1+20240203-0.1
>
> $ gcc -dumpspecs | fgrep -A1 '*asm_debug:'
> *asm_debug:
> %{g*:%{%:debug-level-gt(0):}} %{ffile-prefix-map=*:--debug-prefix-map
>  %*} %{fdebug-prefix-map=*:--debug-prefix-map %*}

I found the commit that provides the additional definition and it can be
ported it back to the earlier releases easily enough.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Samples for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra