[r-cran-rprotobuf] 05/06: Adapt patch

Andreas Tille tille at debian.org
Tue Oct 24 20:50:34 UTC 2017


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

tille pushed a commit to branch master
in repository r-cran-rprotobuf.

commit dd8b8d641cfc7a83939208ff84fa1d11132a27bc
Author: Andreas Tille <tille at debian.org>
Date:   Tue Oct 24 21:50:23 2017 +0200

    Adapt patch
---
 debian/patches/add-hardening.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/add-hardening.patch b/debian/patches/add-hardening.patch
index 4d426e6..8caeaf1 100644
--- a/debian/patches/add-hardening.patch
+++ b/debian/patches/add-hardening.patch
@@ -2,9 +2,9 @@ Description: Added bindnow hardening
 Author: Jonathon Love <jon at thon.cc>
 --- a/src/Makevars.in
 +++ b/src/Makevars.in
-@@ -4,4 +4,4 @@
- ## both Rcpp (ie libRcpp.so and Rcpp.h) and 
- ## ProtoBuf headers and library via the variables
- PKG_CPPFLAGS=		@PKG_CPPFLAGS@
--PKG_LIBS=		@PKG_LIBS@ 
-+PKG_LIBS=		@PKG_LIBS@ -Wl,-z,now
+@@ -6,4 +6,4 @@ CXX_STD=CXX11
+ ## Configure tells us about locations for ## both Rcpp (ie libRcpp.so and Rcpp.h) and 
+ ## ProtoBuf headers and library via these variables
+ PKG_CPPFLAGS=@PKG_CPPFLAGS@
+-PKG_LIBS=@PKG_LIBS@ 
++PKG_LIBS=@PKG_LIBS@ -Wl,-z,now

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



More information about the debian-science-commits mailing list