[med-svn] [sra-sdk] 04/07: Exclude ext libraries

[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 7979f8d548048256d0c657ea3f258cee18b93b5e
Author: Andreas Tille <tille at debian.org>
Date:   Tue Aug 13 15:07:23 2013 +0200

    Exclude ext libraries
---
 debian/patches/10_portability.patch             |   60 +++++++++++++----------
 debian/patches/do_not_build_external_libs.patch |   10 ++++
 debian/patches/series                           |    1 +
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/debian/patches/10_portability.patch b/debian/patches/10_portability.patch
index 5f1566f..0257553 100644
--- a/debian/patches/10_portability.patch
+++ b/debian/patches/10_portability.patch
@@ -1,8 +1,8 @@
---- sra-sdk.orig/build/Makefile.gcc
-+++ sra-sdk/build/Makefile.gcc
-@@ -46,12 +46,6 @@
- # tool options
- WARN = -Wall # -Wconversion
+--- a/build/Makefile.gcc
++++ b/build/Makefile.gcc
+@@ -53,12 +53,6 @@ ifeq (linux,$(OS))
+     NO_ARRAY_BOUNDS_WARNING = -Wno-array-bounds
+ endif
  
 -ifeq (64,$(BITS))
 -	CARCH = -m64
@@ -13,35 +13,36 @@
  ifeq (prof, $(BUILD))
  	PROF = -pg
  endif
---- sra-sdk.orig/build/Makefile.shell
-+++ sra-sdk/build/Makefile.shell
+--- a/build/Makefile.shell
++++ b/build/Makefile.shell
 @@ -26,6 +26,7 @@
  # determine OS
  UNAME = $(shell uname -s)
  
-+OS = ''
++HOST_OS = ''
  ifeq (Darwin, $(UNAME))
- 	OS = mac
+ 	HOST_OS = mac
  endif
-@@ -41,11 +42,16 @@
+@@ -42,12 +43,17 @@ endif
  ifeq (xMINGW, $(findstring xMINGW,x$(UNAME)))
- 	OS = win
+ 	HOST_OS = win
  endif
 +# handle all other OSes (like BSD or Hurd) as if they were linux (see bug #627861)
-+ifeq ($(OS), '')
-+	OS = linux
++ifeq ($(HOST_OS), '')
++	HOST_OS = linux
 +endif
  
- # OS flavor is normally OS
- OSFLAV = $(OS)
+ # assume build OS is the same as host OS
+ OS = $(HOST_OS)
+ BUILD_OS = $(OS)
  
  # determine ARCH
-+ARCH=''
- ifeq (mac,$(OS))
- 	ARCH = $(shell $(TOP)/build/mac.arch.sh)
- else
-@@ -70,13 +76,13 @@
- 		ARCH = sparc32
++HOST_ARCH=''
+ ARCHITECTURES = default
+ ifeq (mac,$(HOST_OS))
+ 	HOST_ARCH = $(shell $(TOP)/build/mac.arch.sh)
+@@ -88,6 +94,10 @@ else
+ 		ARCHITECTURES = sparc64 sparc32
  	endif
  endif
 +# Handle all other architectures equivalent as i386 (see bug #627861)
@@ -49,13 +50,22 @@
 +	ARCH = i386
 +endif
  
+ ARCH = $(HOST_ARCH)
+ REMOTE_ARCH = $(ARCH)
+@@ -136,15 +146,4 @@ endif
+ OSFLAV = $(OS)
+ 
  # determine BITS
 -ifeq (x86_64, $(ARCH))
 -	BITS = 64
--else
+-endif
+-ifeq (sparc64, $(ARCH))
+-	BITS = 64
+-endif
+-ifeq (i386, $(ARCH))
+-	BITS = 32
+-endif
+-ifeq (sparc32, $(ARCH))
 -	BITS = 32
 -endif
 +BITS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
- 
- # first pass through defines SRCDIR
- ifndef SRCDIR
diff --git a/debian/patches/do_not_build_external_libs.patch b/debian/patches/do_not_build_external_libs.patch
new file mode 100644
index 0000000..40886c5
--- /dev/null
+++ b/debian/patches/do_not_build_external_libs.patch
@@ -0,0 +1,10 @@
+--- a/libs/Makefile
++++ b/libs/Makefile
+@@ -32,7 +32,6 @@ include $(TOP)/build/Makefile.shell
+ # default
+ #
+ SUBDIRS = \
+-	ext \
+ 	klib \
+ 	kproc \
+ 	kfs \
diff --git a/debian/patches/series b/debian/patches/series
index a2cecac..2d5a674 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+do_not_build_external_libs.patch
 10_portability.patch

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