[polyml] 01/05: polyc-dont-capture-build-path: New patch to not capture -fdebug-prefix-map

[James Clarke]

This is an automated email from the git hooks/post-receive script.

jrtc27 pushed a commit to branch master
in repository polyml.

commit b75b11d3d28bcfa55624295a3c2678d5b97857df
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Fri Jan 6 12:28:29 2017 +0000

    polyc-dont-capture-build-path: New patch to not capture -fdebug-prefix-map
---
 debian/patches/polyc-dont-capture-build-path.diff | 40 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/polyc-dont-capture-build-path.diff b/debian/patches/polyc-dont-capture-build-path.diff
new file mode 100644
index 0000000..a4d7c33
--- /dev/null
+++ b/debian/patches/polyc-dont-capture-build-path.diff
@@ -0,0 +1,40 @@
+Description: Don't capture -fdebug-prefix-map in polyc's CFLAGS
+Author: James Clarke <jrtc27 at jrtc27.com>
+Forwarded: https://github.com/polyml/polyml/pull/73
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
++++ b/configure.ac
+@@ -559,6 +559,21 @@ if test X"$gitinstalled" = "Xyes" -a -d
+     AC_SUBST(GIT_VERSION)
+ fi
+ 
++# Strip -fdebug-prefix-map= from CFLAGS; it's meaningless for users of polyc,
++# and hurts reproducibility.
++polyc_CFLAGS=
++for cflag in $CFLAGS; do
++    cflag="${cflag##-fdebug-prefix-map=*}"
++    if test -n "$cflag"; then
++        if test -n "$polyc_CFLAGS"; then
++            polyc_CFLAGS="$polyc_CFLAGS $cflag"
++        else
++            polyc_CFLAGS="$cflag"
++        fi
++    fi
++done
++AC_SUBST([polyc_CFLAGS], ["$polyc_CFLAGS"])
++
+ # Modules directory
+ AC_ARG_WITH([moduledir],
+   [AS_HELP_STRING([--with-moduledir=DIR], [directory for Poly/ML modules])],
+--- a/polyc.in
++++ b/polyc.in
+@@ -5,7 +5,7 @@ BINDIR=@bindir@
+ LINK=@CXX@
+ LIBDIR=@libdir@
+ LIBS="@LIBS@"
+-CFLAGS="@CFLAGS@"
++CFLAGS="@polyc_CFLAGS@"
+ 
+ DEFAULT_COMPILER="${BINDIR}/poly"
+ COMPILER=${DEFAULT_COMPILER}
diff --git a/debian/patches/series b/debian/patches/series
index e0c1e51..c09f07e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ thread-exited-interrupt-requested-overlap.diff
 polyc-it.diff
 reset-save-vector-sleep.diff
 wait-return-valid-status.diff
+polyc-dont-capture-build-path.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polyml.git