Bug#913620: Happened before in #905187
Oh, so thought I already uploaded it, but I hadn’t. So, I did it just now. Thanks! -- Ondřej Surý > On 14 Nov 2018, at 15:47, Felipe Sateler wrote: > > Hi Ondrej, > > On Wed, Nov 14, 2018 at 11:42 AM OndÅ™ej Surý wrote: >>> The previous fix was not a real fix, it only rebuilt the package in a >>> non-merged environment. >> >> >> Umm, what? >> >> https://salsa.debian.org/php-team/php/blob/master-7.3/debian/patches/0048-Don-t-use-sed-found-by-configure-use-the-sed-command.patch > > I meant the fix for #905187, and based on the changelog entry. > > Anyway, I see you have already tagged an upload containing that commit. Let's > just wait for it to enter unstable. > > Thanks! > > -- > > Saludos, > Felipe Sateler
Bug#913620: Happened before in #905187
Hi Ondrej, On Wed, Nov 14, 2018 at 11:42 AM Ondřej Surý wrote: > The previous fix was not a real fix, it only rebuilt the package in a > non-merged environment. > > > Umm, what? > > > https://salsa.debian.org/php-team/php/blob/master-7.3/debian/patches/0048-Don-t-use-sed-found-by-configure-use-the-sed-command.patch > I meant the fix for #905187, and based on the changelog entry. Anyway, I see you have already tagged an upload containing that commit. Let's just wait for it to enter unstable. Thanks! -- Saludos, Felipe Sateler
Bug#913620: Happened before in #905187
Thanks for the updated patch. Am 14.11.18 um 15:12 schrieb Felipe Sateler: > Thanks. Please find an attached patch. However, I don't think this makes > a practical difference for debian packages, since they run configure > only once per builddir. True. That said, I wanted to post it here since I assume we will likely see more of such patches and following a best practice here seemed like a good idea. Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? signature.asc Description: OpenPGP digital signature
Bug#913620: Happened before in #905187
> The previous fix was not a real fix, it only rebuilt the package in a > non-merged environment. Umm, what? https://salsa.debian.org/php-team/php/blob/master-7.3/debian/patches/0048-Don-t-use-sed-found-by-configure-use-the-sed-command.patch -- Ondřej Surý > On 14 Nov 2018, at 14:42, Felipe Sateler wrote: > > Control: tags -1 patch > Control: user m...@linux.it > Control: usertags -1 usrmerge > > On Tue, 13 Nov 2018 01:27:41 -0800 Kunal Mehta wrote: > > This is the same regression as #905187 - is there a good way we can > > prevent this from happening again? > > The previous fix was not a real fix, it only rebuilt the package in a > non-merged environment. Please find attached a patch that sets SED to a > known-good value, thus making the build work for both merged and non-merged > systems. > > Saludos, > Felipe Sateler > <0001-Always-use-bin-sed-as-sed-command.patch>
Bug#913620: Happened before in #905187
On Wed, Nov 14, 2018 at 11:01 AM Michael Biebl wrote:
> Hi Felipe
>
> On Wed, 14 Nov 2018 10:42:55 -0300 Felipe Sateler
> wrote:
> > + SED=/bin/sed dh_auto_configure --builddirectory $${target}-build
> $(PARALLEL) -- $$(eval echo \$${$${target}_config}); \
>
> Reading
>
> https://stackoverflow.com/questions/13848154/passing-environment-variables-to-autoconfs-configure
> it appears to me that setting SED=/bin/sed as an argument to
> configure/dh_auto_auto_configure is preferred over passing as env var.
>
Thanks. Please find an attached patch. However, I don't think this makes a
practical difference for debian packages, since they run configure only
once per builddir.
--
Saludos,
Felipe Sateler
From ed1b5bb488c9b9b026e27bf273f668fe825ca9fe Mon Sep 17 00:00:00 2001
From: Felipe Sateler
Date: Wed, 14 Nov 2018 10:36:47 -0300
Subject: [PATCH] Always use /bin/sed as sed command
Autodetection by configure script might find /usr/bin/sed in systems where
/ has been merged with /usr, which then doesn't work on non-merged systems.
Closes: #913228
---
debian/rules | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index c32856580..f953c2cb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -206,7 +206,8 @@ COMMON_CONFIG := \
--with-zlib-dir=/usr \
$(CONFIGURE_ZTS) \
$(CONFIGURE_DTRACE_ARGS) \
- $(CONFIGURE_PCRE_JIT)
+ $(CONFIGURE_PCRE_JIT) \
+ SED=/bin/sed
# disable all SAPIs in extension build
export ext_config = \
--
2.19.1
Bug#913620: Happened before in #905187
On Tue, 13 Nov 2018 01:27:41 -0800 Kunal Mehta wrote: > This is the same regression as #905187 - is there a good way we can > prevent this from happening again? Fwiw, reprroducible-builds.org now also contains a merged-usr variation, which also found this particular problem: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/php7.3.html │ │ │ │ -SED="/bin/sed" │ │ │ │ +SED="/usr/bin/sed" We now would just need a more automated way to extract that information from those reproducible-build reports. Simply grepping for /usr/(s)bin might be a naive start. Once you make your package reproducible, such a regression introduced by merged-usr can be caught. Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? signature.asc Description: OpenPGP digital signature
Bug#913620: Happened before in #905187
Hi Felipe
On Wed, 14 Nov 2018 10:42:55 -0300 Felipe Sateler
wrote:
> + SED=/bin/sed dh_auto_configure --builddirectory $${target}-build
> $(PARALLEL) -- $$(eval echo \$${$${target}_config}); \
Reading
https://stackoverflow.com/questions/13848154/passing-environment-variables-to-autoconfs-configure
it appears to me that setting SED=/bin/sed as an argument to
configure/dh_auto_auto_configure is preferred over passing as env var.
Regards,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
signature.asc
Description: OpenPGP digital signature
Bug#913620: Happened before in #905187
Control: tags -1 patch
Control: user m...@linux.it
Control: usertags -1 usrmerge
On Tue, 13 Nov 2018 01:27:41 -0800 Kunal Mehta
wrote:
> This is the same regression as #905187 - is there a good way we can
> prevent this from happening again?
The previous fix was not a real fix, it only rebuilt the package in a
non-merged environment. Please find attached a patch that sets SED to a
known-good value, thus making the build work for both merged and non-merged
systems.
Saludos,
Felipe Sateler
From 1b4df9e00b2093cd688f2d4d455912c8da48494e Mon Sep 17 00:00:00 2001
From: Felipe Sateler
Date: Wed, 14 Nov 2018 10:36:47 -0300
Subject: [PATCH] Always use /bin/sed as sed command
Autodetection by configure script might find /usr/bin/sed in systems where
/ has been merged with /usr, which then doesn't work on non-merged systems.
Closes: #913228
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index c32856580..932c23ffd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -333,7 +333,7 @@ override_dh_auto_configure-indep:
override_dh_auto_configure-arch: prepared
for target in $(TARGETS); do \
- dh_auto_configure --builddirectory $${target}-build $(PARALLEL) -- $$(eval echo \$${$${target}_config}); \
+ SED=/bin/sed dh_auto_configure --builddirectory $${target}-build $(PARALLEL) -- $$(eval echo \$${$${target}_config}); \
done
override_dh_auto_build-indep:
--
2.19.1
Bug#913620: Happened before in #905187
This is the same regression as #905187 - is there a good way we can prevent this from happening again? HTH, -- Kunal signature.asc Description: OpenPGP digital signature
