Package: p4vasp
Version: 0.3.30+dfsg-4+b1
Severity: normal
Tags: unreproducible patch
User: m...@linux.it
Usertags: usrmerge

Dear maintainer.

The package p4vasp currently fails to build reproducibly on
merged-usr vs non-merged systems.

Please see attached patch fixing this issue.

Regards, Andreas Henriksson 
diff -Nru p4vasp-0.3.30+dfsg/debian/changelog 
p4vasp-0.3.30+dfsg/debian/changelog
--- p4vasp-0.3.30+dfsg/debian/changelog 2018-11-16 10:32:37.000000000 +0100
+++ p4vasp-0.3.30+dfsg/debian/changelog 2018-12-06 19:34:57.000000000 +0100
@@ -1,3 +1,11 @@
+p4vasp (0.3.30+dfsg-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add debian/patches/fixed-bin-sh-path.patch
+    - fixes reproducible build on merged-usr vs non-merged systems
+
+ -- Andreas Henriksson <andr...@fatal.se>  Thu, 06 Dec 2018 19:34:57 +0100
+
 p4vasp (0.3.30+dfsg-4) unstable; urgency=medium
 
   * Drop dependency on libgnomeui-0, thanks Jeremy Bicha! (Closes: #911204)
diff -Nru p4vasp-0.3.30+dfsg/debian/patches/fixed-bin-sh-path.patch 
p4vasp-0.3.30+dfsg/debian/patches/fixed-bin-sh-path.patch
--- p4vasp-0.3.30+dfsg/debian/patches/fixed-bin-sh-path.patch   1970-01-01 
01:00:00.000000000 +0100
+++ p4vasp-0.3.30+dfsg/debian/patches/fixed-bin-sh-path.patch   2018-12-06 
19:34:57.000000000 +0100
@@ -0,0 +1,19 @@
+From: Andreas Henriksson <andr...@fatal.se>
+Subject: fixed /bin/sh path
+
+Do not try to attempt to look up sh from the build system. There's no
+guarantee that you won't find it in a weird path at build time which
+doesn't exist at all on the machine the package is installed and executed on.
+Simply use /bin/sh which is always the right thing.
+
+--- a/Makefile
++++ b/Makefile
+@@ -61,7 +61,7 @@
+       echo "# set p4vasp environment variables"   >  $(SETENVIRONMENT)
+       echo "export PATH=\$$PATH:"$(BINDIR) >> $(SETENVIRONMENT)
+ launcher:
+-      echo "#!`which sh`" >$(P4V)
++      echo "#!/bin/sh" >$(P4V)
+       echo "export LD_PRELOAD=libstdc++.so.6" >>$(P4V)
+       echo "export UBUNTU_MENUPROXY=0" >>$(P4V)
+       echo "export P4VASP_HOME=/usr/share/p4vasp" >> $(P4V)
diff -Nru p4vasp-0.3.30+dfsg/debian/patches/series 
p4vasp-0.3.30+dfsg/debian/patches/series
--- p4vasp-0.3.30+dfsg/debian/patches/series    2018-11-16 10:02:00.000000000 
+0100
+++ p4vasp-0.3.30+dfsg/debian/patches/series    2018-12-06 19:34:32.000000000 
+0100
@@ -7,3 +7,4 @@
 fix-glade-typo.patch
 fix-swig-len.patch
 fPIC.patch
+fixed-bin-sh-path.patch

Reply via email to