From 462ab8c3c30252b190b048b62ba7b3639ce58b7e Mon Sep 17 00:00:00 2001
From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Mon, 8 Feb 2016 22:24:32 +0530
Subject: Introduce patch to ignore LIBRE_SO

LIBE_SO setting is not really mandatory for package builds because
library will be in system path.
---
 debian/patches/2001_drop_libre_so_check.patch | 48 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 debian/patches/2001_drop_libre_so_check.patch
 create mode 100644 debian/patches/series

(limited to 'debian')

diff --git a/debian/patches/2001_drop_libre_so_check.patch b/debian/patches/2001_drop_libre_so_check.patch
new file mode 100644
index 0000000..455ba29
--- /dev/null
+++ b/debian/patches/2001_drop_libre_so_check.patch
@@ -0,0 +1,48 @@
+Description: Drop checking for LIBRE_SO for empty
+ LIBRE_SO variable holds path for libre.so library.
+ This is not really required for package builds as
+ ld will search system paths for library.
+ .
+ This patch might not be suitable for upstream though.
+Author: Vasudev Kamath <vasudev@copyninja.info>
+Last-Update: 2016-02-08
+
+--- a/Makefile
++++ b/Makefile
+@@ -148,17 +148,13 @@
+ 	@echo "ERROR: Missing header files for libre. Check LIBRE_INC"
+ 	@exit 2
+ endif
+-ifeq ($(LIBRE_SO),)
+-	@echo "ERROR: Missing library files for libre. Check LIBRE_SO"
+-	@exit 2
+-endif
+ 
+ Makefile:	mk/*.mk $(MOD_MK) $(LIBRE_MK)
+ 
+ 
+ $(SHARED): $(LIB_OBJS)
+ 	@echo "  LD      $@"
+-	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
++	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -lre $(LIBS) -o $@
+ 
+ $(STATICLIB): $(LIB_OBJS)
+ 	@echo "  AR      $@"
+@@ -174,7 +170,7 @@
+ ifneq ($(GPROF),)
+ 	@$(LD) $(LFLAGS) $(APP_LFLAGS) $^ ../re/libre.a $(LIBS) -o $@
+ else
+-	@$(LD) $(LFLAGS) $(APP_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
++	@$(LD) $(LFLAGS) $(APP_LFLAGS) $^  -lre $(LIBS) -o $@
+ endif
+ 
+ 
+@@ -184,7 +180,7 @@
+ $(TEST_BIN):	$(STATICLIB) $(TEST_OBJS)
+ 	@echo "  LD      $@"
+ 	@$(LD) $(LFLAGS) $(TEST_OBJS) \
+-		-L$(LIBRE_SO) -L. \
++		-L. \
+ 		-l$(PROJECT) -lre $(LIBS) -o $@
+ 
+ $(BUILD)/%.o: %.c $(BUILD) Makefile $(APP_MK)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7440c68
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_drop_libre_so_check.patch
-- 
cgit v1.2.3