[vlfeat] 07/10: removed architecture detection logic
Dima Kogan
dima at secretsauce.net
Fri Oct 17 02:01:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
dkogan-guest pushed a commit to branch patches
in repository vlfeat.
commit c78784df18ead8b478aafc1ae312a3aae287dccc
Author: Dima Kogan <dima at secretsauce.net>
Date: Fri Nov 22 14:19:13 2013 -0800
removed architecture detection logic
This isn't needed on debian, and builds were failing on i386 machines since the
detection was seeing a 64-bit system for some reason
---
Makefile | 50 ++++----------------------------------------------
make/bin.mak | 18 ------------------
make/dll.mak | 23 -----------------------
make/matlab.mak | 53 -----------------------------------------------------
make/octave.mak | 8 --------
5 files changed, 4 insertions(+), 148 deletions(-)
diff --git a/Makefile b/Makefile
index 7fbb3c4..8156e1a 100644
--- a/Makefile
+++ b/Makefile
@@ -104,12 +104,6 @@ all:
# Error Messages
# --------------------------------------------------------------------
-err_no_arch =
-err_no_arch +=$(shell echo "** Unknown host architecture '$(UNAME)'. This identifier" 1>&2)
-err_no_arch +=$(shell echo "** was obtained by running 'uname -sm'. Edit the Makefile " 1>&2)
-err_no_arch +=$(shell echo "** to add the appropriate configuration." 1>&2)
-err_no_arch +=config
-
err_internal =$(shell echo Internal error)
err_internal +=internal
@@ -121,22 +115,8 @@ err_spaces +=spaces
# Auto-detect architecture
# --------------------------------------------------------------------
-Darwin_PPC_ARCH := mac
-Darwin_Power_Macintosh_ARCH := mac
-Darwin_i386_ARCH := maci64
-Darwin_x86_64_ARCH := maci64
-Linux_i386_ARCH := glnx86
-Linux_i686_ARCH := glnx86
-Linux_unknown_ARCH := glnx86
-Linux_x86_64_ARCH := glnxa64
-
-UNAME := $(shell uname -sm)
-ARCH ?= $($(shell echo "$(UNAME)" | tr \ _)_ARCH)
-
-# sanity check
-ifeq ($(ARCH),)
-die:=$(error $(err_no_arch))
-endif
+
+ARCH := debian
ifneq ($(VLDIR),$(shell echo "$(VLDIR)" | sed 's/ //g'))
die:=$(error $(err_spaces))
@@ -204,32 +184,11 @@ DISABLE_OPENMP:=yes
endif
endif
-# Mac OS X Intel
-ifeq "$(ARCH)" "$(filter $(ARCH),maci maci64)"
-ifeq "$(ARCH)" "maci"
-march=32
-else
-march=64
-endif
-SDKROOT ?= $(shell xcrun -sdk macosx --show-sdk-path)
-MACOSX_DEPLOYMENT_TARGET ?= 10.4
-STD_CFLAGS += -m$(march) -isysroot $(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
-STD_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
-endif
-
-# Linux
-ifeq "$(ARCH)" "$(filter $(ARCH),glnx86 glnxa64)"
-ifeq "$(ARCH)" "glnx86"
-march=32
-else
-march=64
-endif
# Target compatibility with GLIBC 2.3.4
# 1) _GNU_SOURCE avoids using isoc99_fscanf, limiting binary portability to recent GLIBC.
# 2) -fno-stack-protector avoids using a feature requiring GLBIC 2.4
-STD_CFLAGS += -m$(march) -D_GNU_SOURCE -fno-stack-protector
-STD_LDFLAGS += -m$(march) -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed
-endif
+STD_CFLAGS += -D_GNU_SOURCE -fno-stack-protector
+STD_LDFLAGS += -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed
# Convert back DISALBE_*="no" flags to be empty
ifeq "$(DISABLE_SSE2)" "no"
@@ -343,7 +302,6 @@ info:
$(call echo-var,PROFILE)
$(call echo-var,DEBUG)
$(call echo-var,VER)
- $(call echo-var,ARCH)
$(call echo-var,CC)
$(call echo-var,COMPILER)
$(call echo-var,COMPILER_VER)
diff --git a/make/bin.mak b/make/bin.mak
index 9e73f29..91c1e64 100644
--- a/make/bin.mak
+++ b/make/bin.mak
@@ -26,24 +26,6 @@ BIN_LDFLAGS = $(STD_LDFLAGS) -L$(BINDIR) -lvl -lm
BIN_LDFLAGS += $(if $(DISABLE_THREADS),,-lpthread)
BIN_LDFLAGS += $(if $(DISABLE_OPENMP),,-fopenmp)
-# Mac OS X Intel 32
-ifeq ($(ARCH),maci)
-endif
-
-# Mac OS X Intel 64
-ifeq ($(ARCH),maci64)
-endif
-
-# Linux-32
-ifeq ($(ARCH),glnx86)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
-# Linux-64
-ifeq ($(ARCH),glnxa64)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
# --------------------------------------------------------------------
# Build
# --------------------------------------------------------------------
diff --git a/make/dll.mak b/make/dll.mak
index a34b2d6..f4be392 100644
--- a/make/dll.mak
+++ b/make/dll.mak
@@ -53,30 +53,7 @@ $(if $(DISABLE_OPENMP),,-fopenmp) \
-Wl,-soname,lib$(DLL_NAME).so.$(API_VERSION)
BINDIR = bin/$(ARCH)
-
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
-DLL_SUFFIX := dylib
-DLL_LDFLAGS += -m32
-endif
-
-# Mac OS X on Intel 64 bit processor
-ifeq ($(ARCH),maci64)
-DLL_SUFFIX := dylib
-DLL_LDFLAGS += -m64
-endif
-
-# Linux-32
-ifeq ($(ARCH),glnx86)
-DLL_SUFFIX := so
-DLL_LDFLAGS += -m32
-endif
-
-# Linux-64
-ifeq ($(ARCH),glnxa64)
DLL_SUFFIX := so
-DLL_LDFLAGS += -m64
-endif
# --------------------------------------------------------------------
# Build
diff --git a/make/matlab.mak b/make/matlab.mak
index 960093c..d77c87f 100644
--- a/make/matlab.mak
+++ b/make/matlab.mak
@@ -87,60 +87,7 @@ $(if $(VERB),-v,) \
$(if $(DEBUG),-g,-O) \
$(if $(PROFILE),-g -O,)
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
-MEX_SUFFIX := mexmaci
-MEX_FLAGS += CC='$(CC)'
-MEX_FLAGS += LD='$(CC)'
-# a hack to support recent Xcode/clang/GCC versions on old MATLABs
-MEX_FLAGS += CFLAGS='\
--arch i386 \
--fno-common \
--fexceptions \
-$(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='\
--arch i386 \
--Wl,-syslibroot,$(SDKROOT) \
--mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) \
--bundle -Wl,-exported_symbols_list,$(MATLAB_PATH)/extern/lib/\$$Arch/\$$MAPFILE \
-$(if $(DISABLE_OPENMP),,-L$(MATLAB_PATH)/sys/os/$(ARCH)/) \
-$(call escape,$(STD_LDFLAGS))'
-endif
-
-# Mac OS X on Intel 64 bit processor
-ifeq ($(ARCH),maci64)
-MEX_SUFFIX := mexmaci64
-MEX_FLAGS += -largeArrayDims
-MEX_FLAGS += CC='$(CC)'
-MEX_FLAGS += LD='$(CC)'
-MEX_FLAGS += CFLAGS='\
--arch x86_64 \
--fno-common \
--fexceptions \
-$(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='\
--arch x86_64 \
--Wl,-syslibroot,$(SDKROOT) \
--mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) \
--bundle -Wl,-exported_symbols_list,$(MATLAB_PATH)/extern/lib/\$$Arch/\$$MAPFILE \
-$(if $(DISABLE_OPENMP),,-L$(MATLAB_PATH)/sys/os/$(ARCH)/) \
-$(call escape,$(STD_LDFLAGS))'
-endif
-
-# Linux on 32 bit processor
-ifeq ($(ARCH),glnx86)
MEX_SUFFIX := mexglx
-MEX_FLAGS += CFLAGS='$$CFLAGS $(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(call escape,$(STD_LDFLAGS))'
-endif
-
-# Linux on 64 bit processorm
-ifeq ($(ARCH),glnxa64)
-MEX_SUFFIX := mexa64
-MEX_FLAGS += -largeArrayDims
-MEX_FLAGS += CFLAGS='$$CFLAGS $(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(call escape,$(STD_LDFLAGS))'
-endif
MEX_BINDIR := toolbox/mex/$(MEX_SUFFIX)
diff --git a/make/octave.mak b/make/octave.mak
index fa79df3..3e657f3 100644
--- a/make/octave.mak
+++ b/make/octave.mak
@@ -43,14 +43,6 @@ OCTAVE_MEX_BINDIR := toolbox/mex/octave/$(MEX_SUFFIX)
OCTAVE_MEX_CFLAGS = $(LINK_DLL_CFLAGS) -Itoolbox
OCTAVE_MEX_LDFLAGS = $(LINK_DLL_LDFLAGS) -lm
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
-endif
-
-# Mac OS X on Intel 64 bit processor
-ifeq ($(ARCH),maci64)
-endif
-
# --------------------------------------------------------------------
# Build
# --------------------------------------------------------------------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git
More information about the debian-science-commits
mailing list