[liblinear] 01/08: d/patches: Updated Properly-build-shared-and-static-libraries-programs

[Christian Kastner]

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

ckk pushed a commit to branch master
in repository liblinear.

commit 62d6b9749ef214a36b11fbc7842d62d0f0a1a8c3
Author: Christian Kastner <ckk at kvr.at>
Date:   Sun Apr 24 16:44:27 2016 +0200

    d/patches: Updated Properly-build-shared-and-static-libraries-programs
    
    Filter out -pie, -fpie, and -fPIE when building the shared library so that
    hardening=+all can be used.
---
 ...perly-build-shared-and-static-libraries-programs.patch | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/patches/Properly-build-shared-and-static-libraries-programs.patch b/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
index 98b6b08..1e06468 100644
--- a/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
+++ b/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
@@ -7,16 +7,16 @@ and link upstream's programs to the shared libraries. Furthermore, provide
 and install target.
 
 Forwarded: not-needed
-Last-Update: 2015-11-01
+Last-Update: 2016-04-24
 ---
- Makefile | 65 +++++++++++++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 44 insertions(+), 21 deletions(-)
+ Makefile | 66 +++++++++++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 45 insertions(+), 21 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 99fdece..e923452 100644
+index 99fdece..6f0a0f9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,32 +1,55 @@
+@@ -1,32 +1,56 @@
  CXX ?= g++
  CC ?= gcc
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -28,8 +28,9 @@ index 99fdece..e923452 100644
 -OS = $(shell uname)
  
 -all: train predict
-+LIB_CFLAGS += $(CFLAGS) -fPIC
-+LIB_LDFLAGS += $(LDFLAGS)
++# Libraries must not be compiled/linked with -pie, -fpie or -FPIE
++LIB_CFLAGS += $(filter-out -fPIE,$(CFLAGS)) -fPIC
++LIB_LDFLAGS += $(filter-out -fPIE, $(filter-out -pie,$(LDFLAGS)))
 +LIB_LIBS += $(LIBS) -lblas
  
 -lib: linear.o tron.o

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