Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]

3 files changed, 86 insertions, 0 deletions

diff --git a/debian/patches/0001-make-shared-library-drivers-buildable-in-32bit-archi.patch b/debian/patches/0001-make-shared-library-drivers-buildable-in-32bit-archi.patch
new file mode 100644
index 0000000..585ef5d
--- /dev/null
+++ b/debian/patches/0001-make-shared-library-drivers-buildable-in-32bit-archi.patch
@@ -0,0 +1,62 @@
+From: David Bremner <david@tethera.net>
+Date: Sun, 13 Jan 2019 09:08:03 -0400
+Subject: make shared library / drivers buildable in 32bit architectures.
+
+To ensure maximum make dialect portability, use variables that can be
+overridden, rather than some conditional structure.
+---
+ makefile | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/makefile b/makefile
+index 439bd12..9fcee00 100644
+--- a/makefile
++++ b/makefile
+@@ -196,8 +196,17 @@ SOMINOR ?=.0.0
+ SHLIB ?=$(SONAME)$(SOMINOR)
+ SHLINK ?=liblrs.so
+ 
+-SHLIBOBJ=lrslong1-shr.o lrslong2-shr.o lrslib1-shr.o lrslib2-shr.o \
+-	lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o
++# for 32 bit architectures
++# BITS=-DB32
++# SHLIBOBJ2=
++
++# for 64 bit architectures
++BITS=-DB128
++SHLIBOBJ2=lrslib2-shr.o lrslong2-shr.o
++
++SHLIBOBJ=lrslong1-shr.o lrslib1-shr.o  \
++	lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o \
++	${SHLIBOBJ2}
+ 
+ SHLIBBIN=lrs-shared redund-shared lrsnash-shared
+ 
+@@ -216,15 +225,23 @@ ${SHLINK}: ${SONAME}
+ 
+ all-shared: ${SHLIBBIN}
+ 
+-lrs-shared: ${SHLINK} lrs.o
+-	$(CC) lrs.o -o $@ -L . -llrs
++lrs-shared: ${SHLINK} lrs-shared.o
++	$(CC) $^ -o $@ -L . -llrs
+ 
+-redund-shared: ${SHLINK}  redund.o
+-	$(CC) redund.o -o $@ -L . -llrs
++redund-shared: ${SHLINK}  redund-shared.o
++	$(CC) $^ -o $@ -L . -llrs
+ 
+ lrsnash-shared: ${SHLINK}  lrsnash.c
+ 	$(CC) -DGMP -DMA lrsnash.c  lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp
+ 
++# driver object files
++
++lrs-shared.o: lrs.c
++	$(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} -c -o $@ lrs.c
++
++redund-shared.o: redund.c
++	$(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} -c -o $@ redund.c
++
+ # build object files for the shared library
+ 
+ lrslib1-shr.o: lrslib.c lrslib.h
diff --git a/debian/patches/0002-use-CFLAGS-when-building-lrsnash-shared.patch b/debian/patches/0002-use-CFLAGS-when-building-lrsnash-shared.patch
new file mode 100644
index 0000000..7f3509f
--- /dev/null
+++ b/debian/patches/0002-use-CFLAGS-when-building-lrsnash-shared.patch
@@ -0,0 +1,22 @@
+From: David Bremner <david@tethera.net>
+Date: Sun, 13 Jan 2019 22:17:58 -0400
+Subject: use CFLAGS when building lrsnash-shared
+
+This is needed to have debug symbols
+---
+ makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 9fcee00..93c36a8 100644
+--- a/makefile
++++ b/makefile
+@@ -232,7 +232,7 @@ redund-shared: ${SHLINK}  redund-shared.o
+ 	$(CC) $^ -o $@ -L . -llrs
+ 
+ lrsnash-shared: ${SHLINK}  lrsnash.c
+-	$(CC) -DGMP -DMA lrsnash.c  lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp
++	$(CC) ${CFLAGS} -DGMP -DMA lrsnash.c  lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp
+ 
+ # driver object files
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..00cebf5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-make-shared-library-drivers-buildable-in-32bit-archi.patch
+0002-use-CFLAGS-when-building-lrsnash-shared.patch