[med-svn] [sra-sdk] 05/06: Ummm, we do not want to commit the patched files in Git ...
Andreas Tille
tille at debian.org
Wed Jul 30 12:22:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository sra-sdk.
commit 8dcca191ddc2aeddb6f8d23ff42f5c8c33bf0dde
Author: Andreas Tille <tille at debian.org>
Date: Wed Jul 30 14:05:16 2014 +0200
Ummm, we do not want to commit the patched files in Git ...
---
Makefile | 6 +++---
build/Makefile.env | 4 ++--
build/Makefile.gcc | 6 ++++++
build/Makefile.shell | 23 ++++++++++++-----------
libs/Makefile | 1 +
libs/kdb/database.c | 2 +-
libs/kdb/index.c | 2 +-
libs/kdb/table.c | 2 +-
libs/ncbi-vdb/Makefile | 6 ++++--
9 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
index 58d55d9..0b467d0 100644
--- a/Makefile
+++ b/Makefile
@@ -81,11 +81,11 @@ PASSTHRUS = \
$(CONFIG) $(PUBLISH)
$(PASSTHRUS):
- @ $(MAKE) -s TOP=$(CURDIR) DEB_CFLAGS="$(DEB_CFLAGS)" DEB_LDFLAGS="$(DEB_LDFLAGS)" -f build/Makefile.env $@
- @ $(MAKE) -s TOP=$(CURDIR) DEB_CFLAGS="$(DEB_CFLAGS)" DEB_LDFLAGS="$(DEB_LDFLAGS)" -f build/Makefile.env rebuild-dirlinks config
+ @ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.env $@
+ @ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.env rebuild-dirlinks config
$(REPORTS):
- @ $(MAKE) -s TOP=$(CURDIR) DEB_CFLAGS="$(DEB_CFLAGS)" DEB_LDFLAGS="$(DEB_LDFLAGS)" -f build/Makefile.env $@
+ @ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.env $@
.PHONY: $(PASSTHRUS) $(REPORTS)
diff --git a/build/Makefile.env b/build/Makefile.env
index ce12830..fcc653c 100644
--- 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) $(DEB_CFLAGS)
+CFLAGS = $(DEBUG) $(DBG) $(CARCH) $(PROF) $(PED) $(LINKAGE) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS)
CPFLAGS = $(DEBUG) $(DBG) $(CARCH) $(PROF) $(LINKAGE) $(DEFINES) $(ARCHDEFS) $(MIN_DEPLOY_OS_OPT) $(INCDIRS)
-LDFLAGS = $(DBG) $(PROF) $(CARCH) $(MIN_DEPLOY_OS_OPT) $(DEB_LDFLAGS)
+LDFLAGS = $(DBG) $(PROF) $(CARCH) $(MIN_DEPLOY_OS_OPT)
diff --git a/build/Makefile.gcc b/build/Makefile.gcc
index 35650a8..d391d1b 100644
--- a/build/Makefile.gcc
+++ b/build/Makefile.gcc
@@ -55,6 +55,12 @@ ifeq (linux,$(OS))
NO_ARRAY_BOUNDS_WARNING = -Wno-array-bounds
endif
+ifeq (64,$(BITS))
+ CARCH = -m64
+else
+ CARCH = -m32
+endif
+
ifeq (prof, $(BUILD))
PROF = -pg
endif
diff --git a/build/Makefile.shell b/build/Makefile.shell
index a9b8f77..0990c50 100644
--- a/build/Makefile.shell
+++ b/build/Makefile.shell
@@ -26,7 +26,6 @@
# determine OS
UNAME = $(shell uname -s)
-HOST_OS = ''
ifeq (Darwin, $(UNAME))
HOST_OS = mac
endif
@@ -43,17 +42,12 @@ endif
ifeq (xMINGW, $(findstring xMINGW,x$(UNAME)))
HOST_OS = win
endif
-# handle all other OSes (like BSD or Hurd) as if they were linux (see bug #627861)
-ifeq ($(HOST_OS), '')
- HOST_OS = linux
-endif
# assume build OS is the same as host OS
OS = $(HOST_OS)
BUILD_OS = $(OS)
# determine ARCH
-HOST_ARCH=''
ARCHITECTURES = default
ifeq (mac,$(HOST_OS))
HOST_ARCH = $(shell $(TOP)/build/mac.arch.sh)
@@ -94,10 +88,6 @@ else
ARCHITECTURES = sparc64 sparc32
endif
endif
-# Handle all other architectures equivalent as i386 (see bug #627861)
-ifeq ($(ARCH),'')
- ARCH = i386
-endif
ARCH = $(HOST_ARCH)
REMOTE_ARCH = $(ARCH)
@@ -146,4 +136,15 @@ endif
OSFLAV = $(OS)
# determine BITS
-BITS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
+ifeq (x86_64, $(ARCH))
+ BITS = 64
+endif
+ifeq (sparc64, $(ARCH))
+ BITS = 64
+endif
+ifeq (i386, $(ARCH))
+ BITS = 32
+endif
+ifeq (sparc32, $(ARCH))
+ BITS = 32
+endif
diff --git a/libs/Makefile b/libs/Makefile
index 1db72c8..ac66110 100644
--- a/libs/Makefile
+++ b/libs/Makefile
@@ -32,6 +32,7 @@ include $(TOP)/build/Makefile.shell
# default
#
SUBDIRS = \
+ ext \
klib \
kproc \
kfs \
diff --git a/libs/kdb/database.c b/libs/kdb/database.c
index 0fbe4b8..7329631 100644
--- a/libs/kdb/database.c
+++ b/libs/kdb/database.c
@@ -216,7 +216,7 @@ rc_t KDBManagerVOpenDBReadInt ( const KDBManager *self, const KDatabase **dbp,
is that of stdc library's printf, not vdb printf */
char dbpath [ 4096 ];
int z = ( args == NULL ) ?
- snprintf ( dbpath, sizeof dbpath, "%s", path ):
+ snprintf ( dbpath, sizeof dbpath, path ):
vsnprintf ( dbpath, sizeof dbpath, path, args );
if ( z < 0 || ( size_t ) z >= sizeof dbpath )
rc = RC ( rcDB, rcMgr, rcOpening, rcPath, rcExcessive );
diff --git a/libs/kdb/index.c b/libs/kdb/index.c
index d76bc56..b4cd1f6 100644
--- a/libs/kdb/index.c
+++ b/libs/kdb/index.c
@@ -492,7 +492,7 @@ LIB_EXPORT rc_t CC KTableVOpenIndexRead ( const KTable *self,
{
int len;
if ( args == 0 )
- len = snprintf ( path, sizeof path, "%s", name );
+ len = snprintf ( path, sizeof path, name );
else
len = vsnprintf ( path, sizeof path, name, args );
if ( len < 0 || ( size_t ) len >= sizeof path )
diff --git a/libs/kdb/table.c b/libs/kdb/table.c
index e64e6af..3072e5a 100644
--- a/libs/kdb/table.c
+++ b/libs/kdb/table.c
@@ -216,7 +216,7 @@ rc_t KDBManagerVOpenTableReadInt ( const KDBManager *self,
char tblpath [ 4096 ];
int z = ( args == NULL ) ?
- snprintf ( tblpath, sizeof tblpath, "%s", path ):
+ snprintf ( tblpath, sizeof tblpath, path ):
vsnprintf ( tblpath, sizeof tblpath, path, args );
if ( z < 0 || ( size_t ) z >= sizeof tblpath )
rc = RC ( rcDB, rcMgr, rcOpening, rcPath, rcExcessive );
diff --git a/libs/ncbi-vdb/Makefile b/libs/ncbi-vdb/Makefile
index 063d37f..8821403 100644
--- a/libs/ncbi-vdb/Makefile
+++ b/libs/ncbi-vdb/Makefile
@@ -87,6 +87,7 @@ endif
VDB_LIB_CMN = \
align-access \
ncbi-bam \
+ bz2 \
kfg \
kfs \
klib \
@@ -96,7 +97,8 @@ VDB_LIB_CMN = \
ksrch \
$(LIBKXML) \
kns \
- vfs
+ vfs \
+ z
VDB_LIB_RD = \
$(VDB_LIB_CMN) \
@@ -113,7 +115,7 @@ VDB_OBJ = \
$(addprefix $(ILIBDIR)/lib,$(addsuffix .a,$(VDB_LIB_RD)))
VDB_LIB = \
- $(addprefix -s,$(VDB_LIB_RD)) -lbz2 -lz
+ $(addprefix -s,$(VDB_LIB_RD))
$(LIBDIR)/libncbi-vdb.$(SHLX): $(VDB_OBJ)
$(LD) --dlib --vers $(SRCDIR) -o $@ $(VDB_LIB)
--
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