[med-svn] [sra-sdk] 01/01: Refresh patches
Andreas Tille
tille at debian.org
Mon Jun 6 11:39:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository sra-sdk.
commit 26976461c27b1f4b5e7e6aa1136209ceaa8fe9b6
Author: Andreas Tille <tille at debian.org>
Date: Mon Jun 6 13:18:35 2016 +0200
Refresh patches
---
debian/patches/10_portability.patch | 6 +++---
debian/patches/find_configure_libs.patch | 2 +-
debian/patches/hardening.patch | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/10_portability.patch b/debian/patches/10_portability.patch
index 1430620..9b5bc56 100644
--- a/debian/patches/10_portability.patch
+++ b/debian/patches/10_portability.patch
@@ -13,7 +13,7 @@ Description: Drop redundant -m32/-m64 option to enable build
ifeq (Darwin, $(UNAME))
HOST_OS = mac
endif
-@@ -46,12 +47,17 @@ endif
+@@ -51,12 +52,17 @@ endif
ifeq (xMINGW, $(findstring xMINGW,x$(UNAME)))
HOST_OS = win
endif
@@ -31,7 +31,7 @@ Description: Drop redundant -m32/-m64 option to enable build
ARCHITECTURES = default
ifeq (mac,$(HOST_OS))
HOST_ARCH = $(shell $(TOP)/build/mac.arch.sh)
-@@ -92,6 +98,10 @@ else
+@@ -104,6 +110,10 @@ else
ARCHITECTURES = sparc64 sparc32
endif
endif
@@ -42,7 +42,7 @@ Description: Drop redundant -m32/-m64 option to enable build
ARCH = $(HOST_ARCH)
REMOTE_ARCH = $(ARCH)
-@@ -161,16 +171,4 @@ ifeq (yes,$(HAS_RHOST))
+@@ -173,16 +183,4 @@ ifeq (yes,$(HAS_RHOST))
endif
# determine BITS
diff --git a/debian/patches/find_configure_libs.patch b/debian/patches/find_configure_libs.patch
index 9feab6f..3d345c8 100644
--- a/debian/patches/find_configure_libs.patch
+++ b/debian/patches/find_configure_libs.patch
@@ -4,7 +4,7 @@ Description: Help configure finding Debian packaged libraries
--- a/setup/konfigure.perl
+++ b/setup/konfigure.perl
-@@ -1442,7 +1442,7 @@ sub check_compiler {
+@@ -1481,7 +1481,7 @@ sub check_compiler {
$flags = $n;
$log = ' int main() { }\n'
} elsif ($n eq 'hdf5') {
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index b9832cd..54ab6c5 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -8,7 +8,7 @@ Description: Propagate Debian hardening options into build system
--- a/Makefile
+++ b/Makefile
-@@ -120,11 +120,11 @@ $(RHOSTS):
+@@ -154,11 +154,11 @@ $(RHOSTS):
@ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.env rebuild-dirlinks config
$(PASSTHRUS):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/sra-sdk.git
More information about the debian-med-commit
mailing list