[vlfeat] 04/10: debian patch update, bumped ABI version
Dima Kogan
dima at secretsauce.net
Fri Oct 17 02:01:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
dkogan-guest pushed a commit to branch master
in repository vlfeat.
commit 3a50da95ff47b7b8baf072039c1422292e5e8d2f
Author: Dima Kogan <dima at secretsauce.net>
Date: Thu Oct 16 14:01:38 2014 -0700
debian patch update, bumped ABI version
---
...po-in-the-Makefile-using-default-CPPFLAGS.patch | 21 +++
...ntal-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch | 35 -----
...0002-removed-bogus-commas-in-the-Makefile.patch | 36 ++---
.../patches/0003-the-DSO-now-has-an-SONAME.patch | 24 ++--
...emoved-unneeded-RPATH-from-the-.mex-files.patch | 4 +-
...0005-octave-make-clean-now-works-properly.patch | 6 +-
...file-generator-now-works.-It-has-include-.patch | 26 ++--
...0007-removed-architecture-detection-logic.patch | 153 ++++++++++++---------
...gle-adsense-and-google-analytics-from-the.patch | 11 +-
...SE2-and-AVX-to-work-on-Debian-s-wide-arra.patch | 4 +-
...new-target-of-mkoctfile-M-.-Closes-756222.patch | 21 +++
...ave-mex-compiler-now-looks-for-headers-in.patch | 30 ++++
debian/patches/series | 4 +-
13 files changed, 223 insertions(+), 152 deletions(-)
diff --git a/debian/patches/0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch b/debian/patches/0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch
new file mode 100644
index 0000000..d09f8a0
--- /dev/null
+++ b/debian/patches/0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch
@@ -0,0 +1,21 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Thu, 16 Oct 2014 15:24:08 -0700
+Subject: Fixed a typo in the Makefile, using default CPPFLAGS
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9b6b7ec..12b14ed 100644
+--- a/Makefile
++++ b/Makefile
+@@ -150,7 +150,7 @@ endif
+ VLDIR ?= .
+ LIBTOOL ?= libtool
+
+-STD_CLFAGS = $(CFLAGS)
++STD_CFLAGS = $(CFLAGS) $(CPPFLAGS)
+ STD_CFLAGS += -std=c99
+ STD_CFLAGS += -Wall -Wextra
+ STD_CFLAGS += -Wno-unused-function -Wno-long-long -Wno-variadic-macros
diff --git a/debian/patches/0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch b/debian/patches/0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch
deleted file mode 100644
index 60dc288..0000000
--- a/debian/patches/0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Wed, 6 Nov 2013 22:30:54 -0800
-Subject: environmental CFLAGS, LDFLAGS, CPPFLAGS are now used
-
-This patch fixes a typo and pulls in the variables
----
- Makefile | 2 +-
- make/dll.mak | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 5584e2a..2d4aaac 100644
---- a/Makefile
-+++ b/Makefile
-@@ -144,7 +144,7 @@ endif
- VLDIR ?= .
- LIBTOOL ?= libtool
-
--STD_CLFAGS = $(CFLAGS)
-+STD_CFLAGS = $(CFLAGS) $(CPPFLAGS)
- STD_CFLAGS += -std=c99
- STD_CFLAGS += -Wall -Wextra
-
-diff --git a/make/dll.mak b/make/dll.mak
-index b386c62..314fc59 100644
---- a/make/dll.mak
-+++ b/make/dll.mak
-@@ -26,6 +26,7 @@ DLL_CFLAGS += $(call if-like,%_sse2,$*, $(if $(DISABLE_SSE2),,-msse2))
- DLL_CFLAGS += $(call if-like,%_avx,$*, $(if $(DISABLE_AVX),,-mavx))
- DLL_CFLAGS += $(if $(DISABLE_OPENMP),,-fopenmp)
-
-+DLL_LDFLAGS = $(STD_LDFLAGS)
- DLL_LDFLAGS += -lm -lpthread
-
- BINDIR = bin/$(ARCH)
diff --git a/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch b/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch
index 9476f8e..0191762 100644
--- a/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch
+++ b/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch
@@ -13,10 +13,10 @@ Subject: removed bogus commas in the Makefile
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
-index 2d4aaac..fd2f5db 100644
+index 12b14ed..afe6b57 100644
--- a/Makefile
+++ b/Makefile
-@@ -297,7 +297,7 @@ include make/octave.mak
+@@ -324,7 +324,7 @@ include make/octave.mak
include make/doc.mak
include make/dist.mak
@@ -26,10 +26,10 @@ index 2d4aaac..fd2f5db 100644
clean:
diff --git a/make/bin.mak b/make/bin.mak
-index 58e1f0c..a0cfa6e 100644
+index 81c878b..9e73f29 100644
--- a/make/bin.mak
+++ b/make/bin.mak
-@@ -56,8 +56,8 @@ deps += $(bin_dep)
+@@ -61,8 +61,8 @@ deps += $(bin_dep)
arch_bins += $(bin_tgt)
comm_bins +=
@@ -41,10 +41,10 @@ index 58e1f0c..a0cfa6e 100644
no_dep_targets += bin-info
diff --git a/make/dist.mak b/make/dist.mak
-index c663841..a4f84aa 100644
+index 2023bbf..58bc426 100644
--- a/make/dist.mak
+++ b/make/dist.mak
-@@ -31,8 +31,8 @@ HOST := vlfeat-admin:vlfeat.org/sandbox
+@@ -33,8 +33,8 @@ HOST := vlfeat-admin:vlfeat.org/sandbox
# Build source package
# --------------------------------------------------------------------
@@ -55,7 +55,7 @@ index c663841..a4f84aa 100644
dist-src:
COPYFILE_DISABLE=1 \
-@@ -68,8 +68,8 @@ dist-src-info:
+@@ -70,8 +70,8 @@ dist-src-info:
#
# dist-src: Packs the commit vXX.XX.XX.
@@ -66,20 +66,20 @@ index c663841..a4f84aa 100644
no_dep_targets += dist-bin dist-bin-release dist-bin-commit dist-bin-info
no_dep_targets += dist-bin-clean dist-bin-archclean dist-bin-distclean
-@@ -192,7 +192,7 @@ dist-bin-info:
+@@ -194,7 +194,7 @@ dist-bin-info:
# Post packages on the web
# --------------------------------------------------------------------
--.PHONY: post, post-doc
-+.PHONY: post post-doc
+-.PHONY: post, post-doc, post-doc-from-dist
++.PHONY: post post-doc post-doc-from-dist
post:
$(RSYNC) \
diff --git a/make/dll.mak b/make/dll.mak
-index 314fc59..032b386 100644
+index 22c3039..4732b64 100644
--- a/make/dll.mak
+++ b/make/dll.mak
-@@ -75,7 +75,7 @@ comm_bins +=
+@@ -96,7 +96,7 @@ comm_bins +=
deps += $(dll_dep)
.PHONY: dll
@@ -89,7 +89,7 @@ index 314fc59..032b386 100644
no_dep_targets += dll-dir dll-clean dll-archclean dll-distclean
no_dep_targets += dll-info
diff --git a/make/doc.mak b/make/doc.mak
-index ac5ec8b..a0b96f9 100644
+index 88f5ab9..c64a2b4 100644
--- a/make/doc.mak
+++ b/make/doc.mak
@@ -287,7 +287,7 @@ doc/index.html: $(webdoc_src) $(doc-dir) \
@@ -102,10 +102,10 @@ index ac5ec8b..a0b96f9 100644
VERSION: vl/generic.h
diff --git a/make/matlab.mak b/make/matlab.mak
-index 65b37b8..7288c8c 100644
+index d9a6a73..5550ce4 100644
--- a/make/matlab.mak
+++ b/make/matlab.mak
-@@ -89,8 +89,8 @@ endif
+@@ -172,8 +172,8 @@ endif
# Build
# --------------------------------------------------------------------
@@ -116,7 +116,7 @@ index 65b37b8..7288c8c 100644
no_dep_targets += mex-dir mex-info mex-test
no_dep_targets += mex-clean mex-distclean mex-archclean
-@@ -199,8 +199,8 @@ m_lnk += $(addprefix toolbox/noprefix/, \
+@@ -288,8 +288,8 @@ m_lnk += $(addprefix toolbox/noprefix/, \
vpath vl_%.m $(shell find $(VLDIR)/toolbox -type d)
@@ -128,10 +128,10 @@ index 65b37b8..7288c8c 100644
no_dep_targets += matlab-clean matlab-archclean matlab-distclean
diff --git a/make/octave.mak b/make/octave.mak
-index f7f2f10..0211428 100644
+index c4b90c3..4cf73d2 100644
--- a/make/octave.mak
+++ b/make/octave.mak
-@@ -66,7 +66,7 @@ endif
+@@ -62,7 +62,7 @@ endif
# Build
# --------------------------------------------------------------------
diff --git a/debian/patches/0003-the-DSO-now-has-an-SONAME.patch b/debian/patches/0003-the-DSO-now-has-an-SONAME.patch
index d058993..3e8eab0 100644
--- a/debian/patches/0003-the-DSO-now-has-an-SONAME.patch
+++ b/debian/patches/0003-the-DSO-now-has-an-SONAME.patch
@@ -7,22 +7,22 @@ Subject: the DSO now has an SONAME
1 file changed, 2 insertions(+)
diff --git a/make/dll.mak b/make/dll.mak
-index 032b386..c6cffea 100644
+index 4732b64..772946e 100644
--- a/make/dll.mak
+++ b/make/dll.mak
-@@ -19,6 +19,7 @@ info: dll-info
- # --------------------------------------------------------------------
+@@ -24,6 +24,7 @@ info: dll-info
+ # build the DLL.
DLL_NAME = vl
-+API_VERSION := 0
++API_VERSION := 1
- DLL_CFLAGS = $(STD_CFLAGS)
- DLL_CFLAGS += -fvisibility=hidden -fPIC -DVL_BUILD_DLL -pthread
-@@ -115,6 +116,7 @@ $(BINDIR)/lib$(DLL_NAME).so : $(dll_obj)
- $(^) \
- $(DLL_LDFLAGS) \
- $(if $(DISABLE_OPENMP),,-fopenmp) \
-+ -Wl,-soname,lib$(DLL_NAME).so.$(API_VERSION) \
- -o $(@)
+ LINK_DLL_CFLAGS = \
+ $(if $(DISABLE_THREADS),-DVL_DISABLE_THREADS) \
+@@ -136,6 +137,7 @@ $(BINDIR)/lib$(DLL_NAME).so : $(dll_obj)
+ $(call C,CC) -shared \
+ $(^) \
+ $(DLL_LDFLAGS) \
++ -Wl,-soname,lib$(DLL_NAME).so.$(API_VERSION) \
+ -o "$(@)"
dll-clean:
diff --git a/debian/patches/0004-removed-unneeded-RPATH-from-the-.mex-files.patch b/debian/patches/0004-removed-unneeded-RPATH-from-the-.mex-files.patch
index 3c4b18a..abac6af 100644
--- a/debian/patches/0004-removed-unneeded-RPATH-from-the-.mex-files.patch
+++ b/debian/patches/0004-removed-unneeded-RPATH-from-the-.mex-files.patch
@@ -7,10 +7,10 @@ Subject: removed unneeded RPATH from the .mex files
1 file changed, 10 deletions(-)
diff --git a/make/octave.mak b/make/octave.mak
-index 0211428..8f72472 100644
+index 4cf73d2..1ee0100 100644
--- a/make/octave.mak
+++ b/make/octave.mak
-@@ -52,16 +52,6 @@ endif
+@@ -48,16 +48,6 @@ endif
ifeq ($(ARCH),maci64)
endif
diff --git a/debian/patches/0005-octave-make-clean-now-works-properly.patch b/debian/patches/0005-octave-make-clean-now-works-properly.patch
index 92dc0a3..e81849c 100644
--- a/debian/patches/0005-octave-make-clean-now-works-properly.patch
+++ b/debian/patches/0005-octave-make-clean-now-works-properly.patch
@@ -12,7 +12,7 @@ Two fixes:
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/make/octave.mak b/make/octave.mak
-index 8f72472..3f44465 100644
+index 1ee0100..fa79df3 100644
--- a/make/octave.mak
+++ b/make/octave.mak
@@ -28,10 +28,13 @@ endif
@@ -30,7 +30,7 @@ index 8f72472..3f44465 100644
info: octave-mex-info
-@@ -65,6 +68,7 @@ octave_mex_src := $(shell find $(VLDIR)/toolbox -name "*.c")
+@@ -61,6 +64,7 @@ octave_mex_src := $(shell find $(VLDIR)/toolbox -name "*.c")
octave_mex_tgt := $(addprefix $(OCTAVE_MEX_BINDIR)/,\
$(notdir $(mex_src:.c=.$(OCTAVE_MEX_SUFFIX)) ) )
octave_mex_dep := $(octave_mex_tgt:.$(OCTAVE_MEX_SUFFIX)=.d)
@@ -38,7 +38,7 @@ index 8f72472..3f44465 100644
octave_mex_dll := $(OCTAVE_MEX_BINDIR)/lib$(DLL_NAME).$(DLL_SUFFIX)
ifdef OCTAVE_ENABLE
-@@ -113,7 +117,7 @@ octave-mex-info:
+@@ -110,7 +114,7 @@ octave-mex-info:
@echo
octave-mex-clean:
diff --git a/debian/patches/0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch b/debian/patches/0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch
index 12aade6..97bd6a1 100644
--- a/debian/patches/0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch
+++ b/debian/patches/0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch
@@ -7,25 +7,25 @@ Subject: the mex .d file generator now works. It has include-path issues
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/make/octave.mak b/make/octave.mak
-index 3f44465..2d2f2b2 100644
+index fa79df3..4939c4d 100644
--- a/make/octave.mak
+++ b/make/octave.mak
-@@ -41,7 +41,8 @@ info: octave-mex-info
+@@ -40,7 +40,8 @@ info: octave-mex-info
+
OCTAVE_MEX_SUFFIX := mex
OCTAVE_MEX_BINDIR := toolbox/mex/octave/$(MEX_SUFFIX)
- OCTAVE_MEX_FLAGS = -L$(BINDIR) -lvl
--OCTAVE_MEX_CFLAGS = -I$(VLDIR)/toolbox
-+OCTAVE_MEX_INC := -I$(VLDIR) -I$(VLDIR)/toolbox
-+OCTAVE_MEX_CFLAGS = $(OCTAVE_MEX_INC)
- OCTAVE_MEX_CFLAGS += $(if $(DEBUG), -g, -O)
- OCTAVE_MEX_CFLAGS += $(if $(PROFILE), -O -g,)
- OCTAVE_MEX_CFLAGS += $(STD_CFLAGS)
-@@ -85,7 +86,7 @@ octave-mex-all: $(octave_mex_tgt) matlab-noprefix
- $(eval $(call gendir, octave-mex, $(OCTAVE_MEX_BINDIR)))
+-OCTAVE_MEX_CFLAGS = $(LINK_DLL_CFLAGS) -Itoolbox
++OCTAVE_MEX_INC := -Itoolbox
++OCTAVE_MEX_CFLAGS = $(LINK_DLL_CFLAGS) $(OCTAVE_MEX_INC)
+ OCTAVE_MEX_LDFLAGS = $(LINK_DLL_LDFLAGS) -lm
+
+ # Mac OS X on Intel 32 bit processor
+@@ -82,7 +83,7 @@ $(eval $(call gendir, octave-mex, $(OCTAVE_MEX_BINDIR)))
$(OCTAVE_MEX_BINDIR)/%.d : %.c $(octave-mex-dir)
-- $(call C,MKOCTFILE) $(OCTAVE_MEX_FLAGS) -M "$(<)"
-+ $(call C,MKOCTFILE) $(OCTAVE_MEX_INC) -M "$(<)"
+ $(call C,MKOCTFILE) \
+- $(OCTAVE_MEX_CFLAGS) -M "$(<)"
++ $(OCTAVE_MEX_INC) -M "$(<)"
@mv "$(<:.c=.d)" $(OCTAVE_MEX_BINDIR)
$(octave_mex_dll) : $(dll_tgt)
diff --git a/debian/patches/0007-removed-architecture-detection-logic.patch b/debian/patches/0007-removed-architecture-detection-logic.patch
index 06be627..111ffba 100644
--- a/debian/patches/0007-removed-architecture-detection-logic.patch
+++ b/debian/patches/0007-removed-architecture-detection-logic.patch
@@ -5,18 +5,18 @@ 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 ----------------------------
+ Makefile | 64 ++++-----------------------------------------------------
+ make/bin.mak | 18 ----------------
+ make/dll.mak | 22 --------------------
+ make/matlab.mak | 51 ---------------------------------------------
make/octave.mak | 8 --------
- 5 files changed, 2 insertions(+), 132 deletions(-)
+ 5 files changed, 4 insertions(+), 159 deletions(-)
diff --git a/Makefile b/Makefile
-index fd2f5db..d6b20fd 100644
+index afe6b57..4fc9531 100644
--- a/Makefile
+++ b/Makefile
-@@ -99,12 +99,6 @@ all:
+@@ -105,12 +105,6 @@ all:
# Error Messages
# --------------------------------------------------------------------
@@ -29,7 +29,7 @@ index fd2f5db..d6b20fd 100644
err_internal =$(shell echo Internal error)
err_internal +=internal
-@@ -116,22 +110,7 @@ err_spaces +=spaces
+@@ -122,22 +116,7 @@ err_spaces +=spaces
# Auto-detect architecture
# --------------------------------------------------------------------
@@ -39,7 +39,7 @@ index fd2f5db..d6b20fd 100644
-Darwin_x86_64_ARCH := maci64
-Linux_i386_ARCH := glnx86
-Linux_i686_ARCH := glnx86
--Linux_unknown_ARC := glnx86
+-Linux_unknown_ARCH := glnx86
-Linux_x86_64_ARCH := glnxa64
-
-UNAME := $(shell uname -sm)
@@ -53,67 +53,71 @@ index fd2f5db..d6b20fd 100644
ifneq ($(VLDIR),$(shell echo "$(VLDIR)" | sed 's/ //g'))
die:=$(error $(err_spaces))
-@@ -160,44 +139,12 @@ STD_LDFLAGS = $(LDFLAGS)
+@@ -205,46 +184,12 @@ DISABLE_OPENMP:=yes
+ endif
+ endif
- # 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
+-# Mac OS X Intel
+-ifeq "$(ARCH)" "$(filter $(ARCH),maci maci64)"
+-ifeq "$(ARCH)" "maci"
+-march=32
+-else
+-march=64
-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: //')
+-SDKROOT ?= $(shell xcrun -sdk macosx --show-sdk-path)
-MACOSX_DEPLOYMENT_TARGET ?= 10.4
--STD_CFLAGS += -m64 -isysroot $(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
+-STD_CFLAGS += -m$(march) -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)
+-# 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 binray portability to recent GLIBC.
+ # 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 += -m32 -D_GNU_SOURCE -fno-stack-protector
--STD_LDFLAGS += -m32 -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed -lpthread -lm
--CC ?= gcc
+-STD_CFLAGS += -m$(march) -D_GNU_SOURCE -fno-stack-protector
+-STD_LDFLAGS += -m$(march) -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed
-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
+-# Convert back DISALBE_*="no" flags to be empty
+-ifeq "$(DISABLE_SSE2)" "no"
+-override DISABLE_SSE2:=
-endif
+-ifeq "$(DISABLE_AVX)" "no"
+-override DISABLE_AVX:=
+-endif
+-ifeq "$(DISABLE_THREADS)" "no"
+-override DISABLE_THREADS:=
+-endif
+-ifeq "$(DISABLE_OPENMP)" "no"
+-override DISABLE_OPENMP:=
+-endif
++STD_CFLAGS += -D_GNU_SOURCE -fno-stack-protector
++STD_LDFLAGS += -Wl,--as-needed -lpthread -lm
++CC ?= gcc
# --------------------------------------------------------------------
# Functions
-@@ -317,7 +264,6 @@ info:
+@@ -344,7 +289,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)
+ $(call echo-var,COMPILER)
+ $(call echo-var,COMPILER_VER)
diff --git a/make/bin.mak b/make/bin.mak
-index a0cfa6e..14d7105 100644
+index 9e73f29..91c1e64 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
+@@ -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)
@@ -137,10 +141,10 @@ index a0cfa6e..14d7105 100644
# Build
# --------------------------------------------------------------------
diff --git a/make/dll.mak b/make/dll.mak
-index c6cffea..03da24b 100644
+index 772946e..80c3ef5 100644
--- a/make/dll.mak
+++ b/make/dll.mak
-@@ -32,29 +32,7 @@ DLL_LDFLAGS += -lm -lpthread
+@@ -53,29 +53,7 @@ $(if $(DISABLE_OPENMP),,-fopenmp)
BINDIR = bin/$(ARCH)
@@ -171,52 +175,77 @@ index c6cffea..03da24b 100644
# --------------------------------------------------------------------
# Build
diff --git a/make/matlab.mak b/make/matlab.mak
-index 7288c8c..e95075e 100644
+index 5550ce4..be899bc 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)'
+@@ -97,60 +97,9 @@ $(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 += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS)'
-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/maci/mexFunction.map \
+-$(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 += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS)'
-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/maci64/mexFunction.map \
+-$(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 += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS) -Wl,--rpath,\\\$$ORIGIN/'
+ 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 += LDFLAGS='$$LDFLAGS $(STD_LDFLAGS) -Wl,--rpath,\\\$$ORIGIN/'
+-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 2d2f2b2..14dffbd 100644
+index 4939c4d..8cb42db 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 =
+@@ -44,14 +44,6 @@ OCTAVE_MEX_INC := -Itoolbox
+ OCTAVE_MEX_CFLAGS = $(LINK_DLL_CFLAGS) $(OCTAVE_MEX_INC)
+ OCTAVE_MEX_LDFLAGS = $(LINK_DLL_LDFLAGS) -lm
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
diff --git a/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch b/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch
index fb4645f..e8950a1 100644
--- a/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch
+++ b/debian/patches/0008-Removed-google-adsense-and-google-analytics-from-the.patch
@@ -6,14 +6,14 @@ This violated the user's privacy:
http://lintian.debian.org/tags/privacy-breach-google-adsense.html
---
- docsrc/vlfeat-website-template.xml | 30 ------------------------------
- 1 file changed, 30 deletions(-)
+ docsrc/vlfeat-website-template.xml | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
diff --git a/docsrc/vlfeat-website-template.xml b/docsrc/vlfeat-website-template.xml
-index a83a6ab..68b8516 100644
+index 3d5ffd2..dd65ca0 100644
--- a/docsrc/vlfeat-website-template.xml
+++ b/docsrc/vlfeat-website-template.xml
-@@ -51,40 +51,10 @@
+@@ -54,43 +54,10 @@
</script>
<script type="text/javascript"
src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"/>
@@ -50,6 +50,9 @@ index a83a6ab..68b8516 100644
- <div class="gcse-searchbox-only" id="google" data-resultsUrl="http://www.vlfeat.org/search.html"></div>
- <h1><a class="plain" href="%pathto:home;"><span id="vlfeat">VLFeat</span><span id="dotorg">.org</span></a></h1>
- </div>
+- <div id="sidebar"> <!-- Navigation Start -->
+- %navigation;
+- </div> <!-- sidebar -->
- </div>
<div id="headbanner-section">
<div id="headbanner">
diff --git a/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch b/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
index 3ba19b9..59557d0 100644
--- a/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
+++ b/debian/patches/0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
@@ -7,10 +7,10 @@ Subject: I disable SSE2 and AVX to work on Debian's wide array of arches
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index d6b20fd..ad0158f 100644
+index 4fc9531..fd061d6 100644
--- a/Makefile
+++ b/Makefile
-@@ -90,8 +90,8 @@ SHELL = /bin/bash
+@@ -96,8 +96,8 @@ SHELL = /bin/bash
all:
# Select which features to disable
diff --git a/debian/patches/0011-Handling-new-target-of-mkoctfile-M-.-Closes-756222.patch b/debian/patches/0011-Handling-new-target-of-mkoctfile-M-.-Closes-756222.patch
new file mode 100644
index 0000000..7b51b9b
--- /dev/null
+++ b/debian/patches/0011-Handling-new-target-of-mkoctfile-M-.-Closes-756222.patch
@@ -0,0 +1,21 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Thu, 16 Oct 2014 16:16:10 -0700
+Subject: Handling new target of 'mkoctfile -M'. (Closes: #756222)
+
+---
+ make/octave.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/make/octave.mak b/make/octave.mak
+index 8cb42db..fcca711 100644
+--- a/make/octave.mak
++++ b/make/octave.mak
+@@ -76,7 +76,7 @@ $(eval $(call gendir, octave-mex, $(OCTAVE_MEX_BINDIR)))
+ $(OCTAVE_MEX_BINDIR)/%.d : %.c $(octave-mex-dir)
+ $(call C,MKOCTFILE) \
+ $(OCTAVE_MEX_INC) -M "$(<)"
+- @mv "$(<:.c=.d)" $(OCTAVE_MEX_BINDIR)
++ @mv "$(notdir $(<:.c=.d))" $(OCTAVE_MEX_BINDIR)
+
+ $(octave_mex_dll) : $(dll_tgt)
+ cp -v "$(<)" "$(@)"
diff --git a/debian/patches/0012-octave-mex-compiler-now-looks-for-headers-in.patch b/debian/patches/0012-octave-mex-compiler-now-looks-for-headers-in.patch
new file mode 100644
index 0000000..e542527
--- /dev/null
+++ b/debian/patches/0012-octave-mex-compiler-now-looks-for-headers-in.patch
@@ -0,0 +1,30 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Thu, 16 Oct 2014 16:22:03 -0700
+Subject: octave mex compiler now looks for headers in .
+
+This was required to build some files:
+
+ "/usr/bin/mkoctfile" \
+ -Itoolbox -M "./toolbox/imop/vl_imsmooth.c"
+ In file included from ./toolbox/imop/vl_imsmooth.c:164:0:
+ ./toolbox/imop/vl_imsmooth.c:17:23: fatal error: vl/float.th: No such file or directory
+ #include <vl/float.th>
+ ^
+ compilation terminated.
+---
+ make/octave.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/make/octave.mak b/make/octave.mak
+index fcca711..8b4e8bc 100644
+--- a/make/octave.mak
++++ b/make/octave.mak
+@@ -40,7 +40,7 @@ info: octave-mex-info
+
+ OCTAVE_MEX_SUFFIX := mex
+ OCTAVE_MEX_BINDIR := toolbox/mex/octave/$(MEX_SUFFIX)
+-OCTAVE_MEX_INC := -Itoolbox
++OCTAVE_MEX_INC := -Itoolbox -I.
+ OCTAVE_MEX_CFLAGS = $(LINK_DLL_CFLAGS) $(OCTAVE_MEX_INC)
+ OCTAVE_MEX_LDFLAGS = $(LINK_DLL_LDFLAGS) -lm
+
diff --git a/debian/patches/series b/debian/patches/series
index 1d4847e..4051855 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch
+0001-Fixed-a-typo-in-the-Makefile-using-default-CPPFLAGS.patch
0002-removed-bogus-commas-in-the-Makefile.patch
0003-the-DSO-now-has-an-SONAME.patch
0004-removed-unneeded-RPATH-from-the-.mex-files.patch
@@ -8,3 +8,5 @@
0008-Removed-google-adsense-and-google-analytics-from-the.patch
0009-I-disable-SSE2-and-AVX-to-work-on-Debian-s-wide-arra.patch
0010-I-no-longer-try-to-generate-x86-specific-code-on-non.patch
+0011-Handling-new-target-of-mkoctfile-M-.-Closes-756222.patch
+0012-octave-mex-compiler-now-looks-for-headers-in.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