[med-svn] [sra-sdk] 05/06: Adapt patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository sra-sdk.

commit 0f20a649d63dbc4fa5980156cef7ca33f7dd948d
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 24 14:42:16 2014 +0200

    Adapt patches
---
 debian/patches/10_portability.patch | 11 ++++++-----
 debian/patches/hardening.patch      | 31 +++++++++++++++++--------------
 debian/patches/series               |  4 +---
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/debian/patches/10_portability.patch b/debian/patches/10_portability.patch
index 78a01a4..f9b56b8 100644
--- a/debian/patches/10_portability.patch
+++ b/debian/patches/10_portability.patch
@@ -20,7 +20,7 @@ Description: Drop redundant -m32/-m64 option to enable build
  endif
 --- a/build/Makefile.shell
 +++ b/build/Makefile.shell
-@@ -26,6 +26,7 @@
+@@ -30,6 +30,7 @@ endif
  # determine OS
  UNAME = $(shell uname -s)
  
@@ -28,7 +28,7 @@ Description: Drop redundant -m32/-m64 option to enable build
  ifeq (Darwin, $(UNAME))
  	HOST_OS = mac
  endif
-@@ -42,12 +43,17 @@ endif
+@@ -46,12 +47,17 @@ endif
  ifeq (xMINGW, $(findstring xMINGW,x$(UNAME)))
  	HOST_OS = win
  endif
@@ -46,7 +46,7 @@ Description: Drop redundant -m32/-m64 option to enable build
  ARCHITECTURES = default
  ifeq (mac,$(HOST_OS))
  	HOST_ARCH = $(shell $(TOP)/build/mac.arch.sh)
-@@ -88,6 +94,10 @@ else
+@@ -92,6 +98,10 @@ else
  		ARCHITECTURES = sparc64 sparc32
  	endif
  endif
@@ -57,8 +57,8 @@ Description: Drop redundant -m32/-m64 option to enable build
  
  ARCH = $(HOST_ARCH)
  REMOTE_ARCH = $(ARCH)
-@@ -136,15 +146,4 @@ endif
- OSFLAV = $(OS)
+@@ -161,16 +171,4 @@ ifeq (yes,$(HAS_RHOST))
+ endif
  
  # determine BITS
 -ifeq (x86_64, $(ARCH))
@@ -73,4 +73,5 @@ Description: Drop redundant -m32/-m64 option to enable build
 -ifeq (sparc32, $(ARCH))
 -	BITS = 32
 -endif
+-
 +BITS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 8500b44..2469346 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -6,21 +6,10 @@ Description: Propagate Debian hardening options into build system
   setting inside the sequence of Makefiles which leads to a loss of
   DEFINES and INCDIRS which are needed to build properly
 
---- a/build/Makefile.env
-+++ b/build/Makefile.env
-@@ -303,6 +303,6 @@ DLLX ?= $(SHLX)
- ARCHDEFS = -D_ARCH_BITS=$(BITS) -DLIBPREFIX=$(LPFX) -DSHLIBEXT=$(DLLX)
- 
- # default tool parameters
--CFLAGS	= $(DEBUG) $(DBG) $(CARCH) $(PROF) $(PED) $(LINKAGE) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS)
-+CFLAGS	= $(DEBUG) $(DBG) $(CARCH) $(PROF) $(PED) $(LINKAGE) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS) $(DEB_CFLAGS)
- CPFLAGS = $(DEBUG) $(DBG) $(CARCH) $(PROF) $(LINKAGE) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS)
--LDFLAGS = $(DBG) $(PROF) $(CARCH) $(MIN_DEPLOY_OS_OPT)
-+LDFLAGS = $(DBG) $(PROF) $(CARCH) $(MIN_DEPLOY_OS_OPT) $(DEB_LDFLAGS)
 --- a/Makefile
 +++ b/Makefile
-@@ -81,11 +81,11 @@ PASSTHRUS = \
- 	$(CONFIG) $(PUBLISH)
+@@ -115,11 +115,11 @@ $(RHOSTS):
+ 	@ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.env rebuild-dirlinks config
  
  $(PASSTHRUS):
 -	@ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.env $@
@@ -32,5 +21,19 @@ Description: Propagate Debian hardening options into build system
 -	@ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.env $@
 +	@ $(MAKE) -s TOP=$(CURDIR) DEB_CFLAGS="$(DEB_CFLAGS)" DEB_LDFLAGS="$(DEB_LDFLAGS)" -f build/Makefile.env $@
  
- .PHONY: $(PASSTHRUS) $(REPORTS)
+ .PHONY: $(PASSTHRUS) $(RHOSTS) $(REPORTS)
+ 
+--- a/build/Makefile.env
++++ b/build/Makefile.env
+@@ -324,9 +324,9 @@ DLLX ?= $(SHLX)
+ ARCHDEFS = -D_ARCH_BITS=$(BITS) -DLIBPREFIX=$(LPFX) -DSHLIBEXT=$(DLLX)
+ 
+ # default tool parameters
+-CFLAGS	= $(DEBUG) $(DBG) $(CARCH) $(PROF) $(PED) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS)
++CFLAGS	= $(DEBUG) $(DBG) $(CARCH) $(PROF) $(PED) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS) $(DEB_CFLAGS)
+ CPFLAGS = $(DEBUG) $(DBG) $(CARCH) $(PROF) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS)
+-LDFLAGS = $(DBG) $(PROF) $(CARCH) $(MIN_DEPLOY_OS_OPT)
++LDFLAGS = $(DBG) $(PROF) $(CARCH) $(MIN_DEPLOY_OS_OPT) $(DEB_LDFLAGS)
  
+ #-------------------------------------------------------------------------------
+ # runtests
diff --git a/debian/patches/series b/debian/patches/series
index 3cfd24c..dd39ee3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-do_not_build_external_libs.patch
 10_portability.patch
-build-with-system-libbz2-libz.patch
 hardening.patch
-hardening-format-security.patch
+# hardening-format-security.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/sra-sdk.git