[vlfeat] 01/01: imported architecture-removing patch
Dima Kogan
dima at secretsauce.net
Fri Nov 22 22:37:39 UTC 2013
This is an automated email from the git hooks/post-receive script.
dkogan-guest pushed a commit to branch master
in repository vlfeat.
commit 5e2057c12c1a7e671d33fa75471dbb913e9086df
Author: Dima Kogan <dima at secretsauce.net>
Date: Fri Nov 22 14:19:39 2013 -0800
imported architecture-removing patch
---
...0007-removed-architecture-detection-logic.patch | 231 +++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 232 insertions(+)
diff --git a/debian/patches/0007-removed-architecture-detection-logic.patch b/debian/patches/0007-removed-architecture-detection-logic.patch
new file mode 100644
index 0000000..06be627
--- /dev/null
+++ b/debian/patches/0007-removed-architecture-detection-logic.patch
@@ -0,0 +1,231 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Fri, 22 Nov 2013 14:19:13 -0800
+Subject: 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 | 58 ++-------------------------------------------------------
+ make/bin.mak | 18 ------------------
+ make/dll.mak | 22 ----------------------
+ make/matlab.mak | 28 ----------------------------
+ make/octave.mak | 8 --------
+ 5 files changed, 2 insertions(+), 132 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fd2f5db..d6b20fd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -99,12 +99,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
+
+@@ -116,22 +110,7 @@ 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_ARC := 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))
+@@ -160,44 +139,12 @@ STD_LDFLAGS = $(LDFLAGS)
+
+ # Architecture specific ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-# Mac OS X Intel 32
+-ifeq ($(ARCH),maci)
+-#SDKROOT ?= $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+-SDKROOT ?= $(shell xcodebuild -version -sdk macosx | sed -n '/^Path\:/p' | sed 's/^Path: //')
+-MACOSX_DEPLOYMENT_TARGET ?= 10.4
+-STD_CFLAGS += -m32 -isysroot $(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
+-STD_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
+-DISABLE_AVX ?= yes
+-CC = gcc
+-endif
+-
+-# Mac OS X Intel 64
+-ifeq ($(ARCH),maci64)
+-#SDKROOT ?= $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+-SDKROOT ?= $(shell xcodebuild -version -sdk macosx | sed -n '/^Path\:/p' | sed 's/^Path: //')
+-MACOSX_DEPLOYMENT_TARGET ?= 10.4
+-STD_CFLAGS += -m64 -isysroot $(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
+-STD_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
+-DISABLE_AVX ?= yes # GCC 4.2 need for OpenMP does not support -mavx
+-CC = gcc
+-endif
+-
+-# Linux-32
+-ifeq ($(ARCH),glnx86)
+ # Target compatibility with GLIBC 2.3.4
+ # 1) _GNU_SOURCE avoids using isoc99_fscanf, limiting binray portability to recent GLIBC.
+ # 2) -fno-stack-protector avoids using a feature requiring GLBIC 2.4
+-STD_CFLAGS += -m32 -D_GNU_SOURCE -fno-stack-protector
+-STD_LDFLAGS += -m32 -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed -lpthread -lm
+-CC ?= gcc
+-endif
+-
+-# Linux-64
+-ifeq ($(ARCH),glnxa64)
+ STD_CFLAGS += -D_GNU_SOURCE -fno-stack-protector
+-STD_LDFLAGS += -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed -lpthread -lm
++STD_LDFLAGS += -Wl,--as-needed -lpthread -lm
+ CC ?= gcc
+-endif
+
+ # --------------------------------------------------------------------
+ # Functions
+@@ -317,7 +264,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,STD_CFLAGS)
+ $(call echo-var,STD_LDFLAGS)
+diff --git a/make/bin.mak b/make/bin.mak
+index a0cfa6e..14d7105 100644
+--- a/make/bin.mak
++++ b/make/bin.mak
+@@ -21,24 +21,6 @@ info: bin-info
+ BIN_CFLAGS = $(STD_CFLAGS) -I$(VLDIR)
+ BIN_LDFLAGS = $(STD_LDFLAGS) -L$(BINDIR) -lvl
+
+-# 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 c6cffea..03da24b 100644
+--- a/make/dll.mak
++++ b/make/dll.mak
+@@ -32,29 +32,7 @@ DLL_LDFLAGS += -lm -lpthread
+
+ 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 7288c8c..e95075e 100644
+--- a/make/matlab.mak
++++ b/make/matlab.mak
+@@ -42,35 +42,7 @@ MEX_FLAGS += $(if $(DEBUG), -g, -O)
+ MEX_FLAGS += $(if $(PROFILE), -O -g,)
+ MEX_FLAGS += CFLAGS='$$CFLAGS $(STD_CFLAGS)'
+
+-# Mac OS X on Intel 32 bit processor
+-ifeq ($(ARCH),maci)
+-MEX_SUFFIX := mexmaci
+-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS)'
+-MEX_FLAGS += CC='$(CC)'
+-MEX_FLAGS += LD='$(CC)'
+-endif
+-
+-# Mac OS X on Intel 64 bit processor
+-ifeq ($(ARCH),maci64)
+-MEX_SUFFIX := mexmaci64
+-MEX_FLAGS += -largeArrayDims
+-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS)'
+-MEX_FLAGS += CC='$(CC)'
+-MEX_FLAGS += LD='$(CC)'
+-endif
+-
+-# Linux on 32 bit processor
+-ifeq ($(ARCH),glnx86)
+ MEX_SUFFIX := mexglx
+-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS) -Wl,--rpath,\\\$$ORIGIN/'
+-endif
+-
+-# Linux on 64 bit processorm
+-ifeq ($(ARCH),glnxa64)
+-MEX_SUFFIX := mexa64
+-MEX_FLAGS += -largeArrayDims
+-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS) -Wl,--rpath,\\\$$ORIGIN/'
+-endif
+
+ MEX_BINDIR := toolbox/mex/$(MEX_SUFFIX)
+
+diff --git a/make/octave.mak b/make/octave.mak
+index 2d2f2b2..14dffbd 100644
+--- a/make/octave.mak
++++ b/make/octave.mak
+@@ -48,14 +48,6 @@ OCTAVE_MEX_CFLAGS += $(if $(PROFILE), -O -g,)
+ OCTAVE_MEX_CFLAGS += $(STD_CFLAGS)
+ OCTAVE_MEX_LDFLAGS =
+
+-# 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
+ # --------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index 0765ae4..088722d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
0004-removed-unneeded-RPATH-from-the-.mex-files.patch
0005-octave-make-clean-now-works-properly.patch
0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch
+0007-removed-architecture-detection-logic.patch
--
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