[vlfeat] 02/07: added patches
Dima Kogan
dkogan-guest at alioth.debian.org
Fri Nov 8 02:51:47 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 00fd084564b1aaf1cb1a1aaa3dc9ba678414129a
Author: Dima Kogan <dima at secretsauce.net>
Date: Wed Nov 6 23:45:17 2013 -0800
added patches
---
...ntal-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch | 35 +++++
...0002-removed-bogus-commas-in-the-Makefile.patch | 142 ++++++++++++++++++++
.../patches/0003-the-DSO-now-has-an-SONAME.patch | 28 ++++
...emoved-unneeded-RPATH-from-the-.mex-files.patch | 29 ++++
...0005-octave-make-clean-now-works-properly.patch | 49 +++++++
...file-generator-now-works.-It-has-include-.patch | 31 +++++
debian/patches/series | 6 +
7 files changed, 320 insertions(+)
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
new file mode 100644
index 0000000..60dc288
--- /dev/null
+++ b/debian/patches/0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 0000000..9476f8e
--- /dev/null
+++ b/debian/patches/0002-removed-bogus-commas-in-the-Makefile.patch
@@ -0,0 +1,142 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Wed, 6 Nov 2013 22:54:40 -0800
+Subject: removed bogus commas in the Makefile
+
+---
+ Makefile | 2 +-
+ make/bin.mak | 4 ++--
+ make/dist.mak | 10 +++++-----
+ make/dll.mak | 2 +-
+ make/doc.mak | 2 +-
+ make/matlab.mak | 8 ++++----
+ make/octave.mak | 2 +-
+ 7 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2d4aaac..fd2f5db 100644
+--- a/Makefile
++++ b/Makefile
+@@ -297,7 +297,7 @@ include make/octave.mak
+ include make/doc.mak
+ include make/dist.mak
+
+-.PHONY: clean, archclean, distclean, info, help
++.PHONY: clean archclean distclean info help
+ no_dep_targets += clean archclean distclean info help
+
+ clean:
+diff --git a/make/bin.mak b/make/bin.mak
+index 58e1f0c..a0cfa6e 100644
+--- a/make/bin.mak
++++ b/make/bin.mak
+@@ -56,8 +56,8 @@ deps += $(bin_dep)
+ arch_bins += $(bin_tgt)
+ comm_bins +=
+
+-.PHONY: bin-all, bin-info
+-.PHONY: bin-clean, bin-archclean, bin-distclean
++.PHONY: bin-all bin-info
++.PHONY: bin-clean bin-archclean bin-distclean
+ no_dep_targets += bin-dir bin-clean bin-archclean bin-distclean
+ no_dep_targets += bin-info
+
+diff --git a/make/dist.mak b/make/dist.mak
+index c663841..a4f84aa 100644
+--- a/make/dist.mak
++++ b/make/dist.mak
+@@ -31,8 +31,8 @@ HOST := vlfeat-admin:vlfeat.org/sandbox
+ # Build source package
+ # --------------------------------------------------------------------
+
+-.PHONY: dist-src, dist-src-clean, dist-src-info
+-no_dep_targets += dist-src, dist-src-clean, dist-src-info
++.PHONY: dist-src dist-src-clean dist-src-info
++no_dep_targets += dist-src dist-src-clean dist-src-info
+
+ dist-src:
+ COPYFILE_DISABLE=1 \
+@@ -68,8 +68,8 @@ dist-src-info:
+ #
+ # dist-src: Packs the commit vXX.XX.XX.
+
+-.PHONY: dist-bin, dist-bin-release, dist-bin-commit, dist-bin-info
+-.PHONY: dist-bin-clean, dist-bin-archclean, dist-bin-distclean
++.PHONY: dist-bin dist-bin-release dist-bin-commit dist-bin-info
++.PHONY: dist-bin-clean dist-bin-archclean dist-bin-distclean
+ 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:
+ # Post packages on the web
+ # --------------------------------------------------------------------
+
+-.PHONY: post, post-doc
++.PHONY: post post-doc
+
+ post:
+ $(RSYNC) \
+diff --git a/make/dll.mak b/make/dll.mak
+index 314fc59..032b386 100644
+--- a/make/dll.mak
++++ b/make/dll.mak
+@@ -75,7 +75,7 @@ comm_bins +=
+ deps += $(dll_dep)
+
+ .PHONY: dll
+-.PHONY: dll-all, dll-clean, dll-archclean, dll-distclean
++.PHONY: dll-all dll-clean dll-archclean dll-distclean
+ .PHONY: dll-info
+ 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
+--- a/make/doc.mak
++++ b/make/doc.mak
+@@ -287,7 +287,7 @@ doc/index.html: $(webdoc_src) $(doc-dir) \
+ # Maintenance and others
+ # --------------------------------------------------------------------
+
+-.PHONY: doc-clean, doc-archclean, doc-distclean
++.PHONY: doc-clean doc-archclean doc-distclean
+ no_dep_targets := doc-clean doc-archclean doc-distclean
+
+ VERSION: vl/generic.h
+diff --git a/make/matlab.mak b/make/matlab.mak
+index 65b37b8..7288c8c 100644
+--- a/make/matlab.mak
++++ b/make/matlab.mak
+@@ -89,8 +89,8 @@ endif
+ # Build
+ # --------------------------------------------------------------------
+
+-.PHONY: mex-all, mex-dir, mex-info, mex-test
+-.PHONY: mex-clean, mex-distclean, mex-archclean
++.PHONY: mex-all mex-dir mex-info mex-test
++.PHONY: mex-clean mex-distclean mex-archclean
+ 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/, \
+
+ vpath vl_%.m $(shell find $(VLDIR)/toolbox -type d)
+
+-.PHONY: matlab-all, matlab-noprefix, matlab-info
+-.PHONY: matlab-clean, matlab-archclean, matlab-distclean
++.PHONY: matlab-all matlab-noprefix matlab-info
++.PHONY: matlab-clean matlab-archclean matlab-distclean
+ no_dep_targets += matlab-all matlab-noprefix matlab-info
+ no_dep_targets += matlab-clean matlab-archclean matlab-distclean
+
+diff --git a/make/octave.mak b/make/octave.mak
+index f7f2f10..0211428 100644
+--- a/make/octave.mak
++++ b/make/octave.mak
+@@ -66,7 +66,7 @@ endif
+ # Build
+ # --------------------------------------------------------------------
+
+-.PHONY: octave-all, octave-mex-all, octave-mex-dir, octave-info
++.PHONY: octave-all octave-mex-all octave-mex-dir octave-info
+ .PHONY: octave-clean octave-archclean octave-distclean
+ no_dep_targets += octave-info
+ no_dep_targets += octave-clean octave-archclean octave-distclean
diff --git a/debian/patches/0003-the-DSO-now-has-an-SONAME.patch b/debian/patches/0003-the-DSO-now-has-an-SONAME.patch
new file mode 100644
index 0000000..d058993
--- /dev/null
+++ b/debian/patches/0003-the-DSO-now-has-an-SONAME.patch
@@ -0,0 +1,28 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Wed, 6 Nov 2013 22:44:35 -0800
+Subject: the DSO now has an SONAME
+
+---
+ make/dll.mak | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/make/dll.mak b/make/dll.mak
+index 032b386..c6cffea 100644
+--- a/make/dll.mak
++++ b/make/dll.mak
+@@ -19,6 +19,7 @@ info: dll-info
+ # --------------------------------------------------------------------
+
+ DLL_NAME = vl
++API_VERSION := 0
+
+ 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 $(@)
+
+ 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
new file mode 100644
index 0000000..3c4b18a
--- /dev/null
+++ b/debian/patches/0004-removed-unneeded-RPATH-from-the-.mex-files.patch
@@ -0,0 +1,29 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Thu, 7 Nov 2013 10:43:21 -0800
+Subject: removed unneeded RPATH from the .mex files
+
+---
+ make/octave.mak | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/make/octave.mak b/make/octave.mak
+index 0211428..8f72472 100644
+--- a/make/octave.mak
++++ b/make/octave.mak
+@@ -52,16 +52,6 @@ endif
+ ifeq ($(ARCH),maci64)
+ endif
+
+-# Linux on 32 bit processor
+-ifeq ($(ARCH),glnx86)
+-OCTAVE_MEX_FLAGS += -Wl,--rpath,\\\$$ORIGIN/
+-endif
+-
+-# Linux on 64 bit processorm
+-ifeq ($(ARCH),glnxa64)
+-OCTAVE_MEX_FLAGS += -Wl,--rpath,\\\$$ORIGIN/
+-endif
+-
+ # --------------------------------------------------------------------
+ # Build
+ # --------------------------------------------------------------------
diff --git a/debian/patches/0005-octave-make-clean-now-works-properly.patch b/debian/patches/0005-octave-make-clean-now-works-properly.patch
new file mode 100644
index 0000000..92dc0a3
--- /dev/null
+++ b/debian/patches/0005-octave-make-clean-now-works-properly.patch
@@ -0,0 +1,49 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Thu, 7 Nov 2013 11:21:57 -0800
+Subject: octave 'make clean' now works properly
+
+Two fixes:
+
+1. 'make clean' now always cleans up octave stuff, even if octave builds are
+ off. This works to clean up from previous runs
+2. octave now cleans up its .o files
+---
+ make/octave.mak | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/make/octave.mak b/make/octave.mak
+index 8f72472..3f44465 100644
+--- a/make/octave.mak
++++ b/make/octave.mak
+@@ -28,10 +28,13 @@ endif
+
+ ifdef OCTAVE_ENABLE
+ all: octave-mex-all
++endif
++
++# cleaning rules are defined even if OCTAVE_ENABLE is off, so that we can clean
++# up previous build products
+ clean: octave-mex-clean
+ archclean: octave-mex-archclean
+ distclean: octave-mex-distclean
+-endif
+
+ info: octave-mex-info
+
+@@ -65,6 +68,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)
++octave_mex_obj := $(notdir $(mex_src:.c=.o))
+ octave_mex_dll := $(OCTAVE_MEX_BINDIR)/lib$(DLL_NAME).$(DLL_SUFFIX)
+
+ ifdef OCTAVE_ENABLE
+@@ -113,7 +117,7 @@ octave-mex-info:
+ @echo
+
+ octave-mex-clean:
+- rm -f $(octave_mex_dep)
++ rm -f $(octave_mex_dep) $(octave_mex_obj)
+
+ octave-mex-archclean: octave-clean
+ rm -f $(octave_mex_tgt)
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
new file mode 100644
index 0000000..12aade6
--- /dev/null
+++ b/debian/patches/0006-the-mex-.d-file-generator-now-works.-It-has-include-.patch
@@ -0,0 +1,31 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Thu, 7 Nov 2013 12:47:04 -0800
+Subject: the mex .d file generator now works. It has include-path issues
+
+---
+ make/octave.mak | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/make/octave.mak b/make/octave.mak
+index 3f44465..2d2f2b2 100644
+--- a/make/octave.mak
++++ b/make/octave.mak
+@@ -41,7 +41,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_BINDIR)/%.d : %.c $(octave-mex-dir)
+- $(call C,MKOCTFILE) $(OCTAVE_MEX_FLAGS) -M "$(<)"
++ $(call C,MKOCTFILE) $(OCTAVE_MEX_INC) -M "$(<)"
+ @mv "$(<:.c=.d)" $(OCTAVE_MEX_BINDIR)
+
+ $(octave_mex_dll) : $(dll_tgt)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0765ae4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+0001-environmental-CFLAGS-LDFLAGS-CPPFLAGS-are-now-used.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
+0005-octave-make-clean-now-works-properly.patch
+0006-the-mex-.d-file-generator-now-works.-It-has-include-.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