blob: a6e408dc2b1bd95693d9724d940160048074d0cc [file] [log] [blame] [edit]
diff --unified -r vlfeat-0.9.21.orig/Makefile vlfeat-0.9.21/Makefile
--- vlfeat-0.9.21.orig/Makefile 2021-05-04 20:20:02.303185600 +0530
+++ vlfeat-0.9.21/Makefile 2021-05-04 20:22:12.785689300 +0530
@@ -239,7 +239,7 @@
# 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
+STD_LDFLAGS += -m$(march) -Wl,--as-needed
endif
# Convert back DISALBE_*="no" flags to be empty
diff --unified -r vlfeat-0.9.21.orig/make/bin.mak vlfeat-0.9.21/make/bin.mak
--- vlfeat-0.9.21.orig/make/bin.mak 2021-05-04 20:20:02.271494100 +0530
+++ vlfeat-0.9.21/make/bin.mak 2021-05-04 20:21:39.579864300 +0530
@@ -44,16 +44,6 @@
BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
endif
-# MingW-32
-ifeq ($(ARCH),mingw32)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
-# MingW-64
-ifeq ($(ARCH),mingw64)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
# --------------------------------------------------------------------
# Build
# --------------------------------------------------------------------
diff --unified -r vlfeat-0.9.21.orig/make/dll.mak vlfeat-0.9.21/make/dll.mak
--- vlfeat-0.9.21.orig/make/dll.mak 2021-05-04 20:20:02.271494100 +0530
+++ vlfeat-0.9.21/make/dll.mak 2021-05-04 20:20:35.413815600 +0530
@@ -37,7 +37,7 @@
DLL_CFLAGS = \
$(STD_CFLAGS) \
--fvisibility=hidden -fPIC -DVL_BUILD_DLL \
+-fvisibility=hidden -DVL_BUILD_DLL \
$(LINK_DLL_CFLAGS) \
$(call if-like,%_sse2,$*, $(if $(DISABLE_SSE2),,-msse2)) \
$(call if-like,%_avx,$*, $(if $(DISABLE_AVX),,-mavx)) \