From e32e72d9e5900cd5a1a3dcc328011cf4a8e6e354 Mon Sep 17 00:00:00 2001
From: Xiangfu <xiangfu@openmobilefree.net>
Date: Wed, 3 Oct 2012 11:47:43 +0800
Subject: [PATCH 1/2] fix no format arguments warnings debian package build
 system will mark this as error

---
 libs/control.c   | 2 +-
 libs/floorplan.c | 2 +-
 libs/helper.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/control.c b/libs/control.c
index ee7182c..6adad8f 100644
--- a/libs/control.c
+++ b/libs/control.c
@@ -1937,7 +1937,7 @@ static void fprintf_inout_pin(FILE* f, struct fpga_model* model,
 		fdev_type2str(tile->devs[dev_idx].type),
 		fdev_typeidx(model, el->y, el->x, dev_idx),
 		pin_str);
-	fprintf(f, buf);
+	fprintf(f, "%s", buf);
 }
 
 void fnet_printf(FILE* f, struct fpga_model* model, net_idx_t net_i)
diff --git a/libs/floorplan.c b/libs/floorplan.c
index 9b33fd7..30e10ea 100644
--- a/libs/floorplan.c
+++ b/libs/floorplan.c
@@ -758,7 +758,7 @@ int printf_conns(FILE* f, struct fpga_model* model)
 						tmp_line[k++] = ' ';
 					sprintf(&tmp_line[k], "y%02i x%02i %s\n",
 						other_tile_y, other_tile_x, other_tile_connpt_str);
-					fprintf(f, tmp_line);
+					fprintf(f, "%s", tmp_line);
 				}
 			}
 		}
diff --git a/libs/helper.c b/libs/helper.c
index 5cf3ca3..b296e64 100644
--- a/libs/helper.c
+++ b/libs/helper.c
@@ -829,7 +829,7 @@ void printf_wrap(FILE* f, char* line, int prefix_len,
 	if (i >= 80) {
 		line[i] = '\n';
 		line[i+1] = 0;
-		fprintf(f, line);
+		fprintf(f, "%s", line);
 		line[prefix_len] = 0;
 		i = prefix_len;
 	}	

From 21d739de967fce9ccab40a3b3a97b513f8410406 Mon Sep 17 00:00:00 2001
From: Xiangfu <xiangfu@openmobilefree.net>
Date: Wed, 3 Oct 2012 15:10:57 +0800
Subject: [PATCH 2/2] add CPPFLAGS and LDFALGS, run chrpath on .so files

---
 Makefile           | 2 +-
 libs/Makefile      | 5 +++--
 mini-jtag/Makefile | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c320a02..2502d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all: new_fp fp2bit bit2fp draw_svg_tiles autotest hstrrep \
 include Makefile.common
 
 %.o:	%.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 	$(MKDEP)
 
 libs/%.so: FAKE
diff --git a/libs/Makefile b/libs/Makefile
index 83ac9cd..40a1ee6 100644
--- a/libs/Makefile
+++ b/libs/Makefile
@@ -41,11 +41,11 @@ libfpga-floorplan.so: $(LIBFPGA_FLOORPLAN_OBJS)
 libfpga-control.so: $(LIBFPGA_CONTROL_OBJS)
 
 %.so:
-	$(CC) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.$(LIBS_VERSION) -o $@.$(LIBS_VERSION) $^
 	@rm -f $@ && ln -s $@.$(LIBS_VERSION) $@
 
 %.o:	%.c
-	$(CC) $(CFLAGS) -fPIC -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
 	$(MKDEP)
 
 clean:
@@ -56,6 +56,7 @@ install: all
 	mkdir -p $(DESTDIR)/$(PREFIX)/include/
 	install -m 644 $(DYNAMIC_HEADS) $(DESTDIR)/$(PREFIX)/include/
 	for f in $(DYNAMIC_LIBS); do \
+		chrpath -d $$f.$(LIBS_VERSION) && \
 		install -m 644 $$f.$(LIBS_VERSION) $(DESTDIR)/$(PREFIX)/lib/$$f.$(LIBS_VERSION) && \
 		(cd $(DESTDIR)/$(PREFIX)/lib/ && ln -s $$f.$(LIBS_VERSION) $$f) \
 		|| exit 1; done
diff --git a/mini-jtag/Makefile b/mini-jtag/Makefile
index ca58011..24229b7 100644
--- a/mini-jtag/Makefile
+++ b/mini-jtag/Makefile
@@ -20,7 +20,7 @@ mini-jtag: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
 
 %.o:	%.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 	$(MKDEP)
 
 install: all