Your message dated Tue, 16 Aug 2022 10:59:48 +0100
with message-id <[email protected]>
and subject line Re: Bug#1000327: meson: please make the generated cmake files
reproducible
has caused the Debian Bug report #1000327,
regarding meson: please make the generated cmake files reproducible
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1000327: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1000327
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: meson
Version: 0.60.1-1
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: timestamps toolchain
X-Debbugs-Cc: [email protected]
Hi,
Whilst working on the Reproducible Builds effort we noticed that
meson is not generating reproducible .cmake files.
For example:
│ │ │ ├── ./usr/lib/x86_64-linux-gnu/cmake/xbyak/xbyakConfig.cmake
│ │ │ │ @@ -1,11 +1,11 @@
│ │ │ │
│ │ │ │ ####### Expanded from @PACKAGE_INIT@ by
configure_package_config_file() #######
│ │ │ │ ####### Any changes to this file will be overwritten by the next CMake
run ####
│ │ │ │ -####### The input file was
/build/1st/xbyak-6.00/cmake/meson-config.cmake.in ########
│ │ │ │ +####### The input file was
/build/2/xbyak-6.00/2nd/cmake/meson-config.cmake.in ########
(This is from src:xbyak version 6.00-2.)
A patch is attached that uses os.path.basename to only include
"meson-config.cmake.in" instead of the full path. This not only makes
the build reproducible, but it also matches CMake's own behaviour.
Specifically, CMakePackageConfigHelpers.cmake does the equivalent
transformation using:
get_filename_component(inputFileName "${_inputFile}" NAME)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] / chris-lamb.co.uk
`-
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py
index 51ee9ee..37838d0 100644
--- a/mesonbuild/modules/cmake.py
+++ b/mesonbuild/modules/cmake.py
@@ -299,7 +299,7 @@ class CmakeModule(ExtensionModule):
def create_package_file(self, infile, outfile, PACKAGE_RELATIVE_PATH,
extra, confdata):
package_init = PACKAGE_INIT_BASE.replace('@PACKAGE_RELATIVE_PATH@',
PACKAGE_RELATIVE_PATH)
- package_init = package_init.replace('@inputFileName@', infile)
+ package_init = package_init.replace('@inputFileName@',
os.path.basename(infile))
package_init += extra
package_init += PACKAGE_INIT_SET_AND_CHECK
--- End Message ---
--- Begin Message ---
Version: 0.61.0~rc1-1
On Sun, 21 Nov 2021 at 09:53:59 -0800, Chris Lamb wrote:
> > Please file this (and all future patches of this type) directly to the
> > upstream project
>
> Sure thing. I've forwarded this upstream here:
>
> https://github.com/mesonbuild/meson/pull/9602
This change appears to have been included in 0.61.0rc1.
smcv
--- End Message ---
