X-Git-Url: https://git.draconx.ca/gitweb/gentoo-draconx.git/blobdiff_plain/d0b8c28b8cabac6aeee4bd88e7baf5cc5e0bec00..0d75a7ee44585b01ffe3c41ebcb6c0a286d712b2:/sys-libs/flashmap/files/flashmap-respect-CFLAGS-LDFLAGS.patch

diff --git a/sys-libs/flashmap/files/flashmap-respect-CFLAGS-LDFLAGS.patch b/sys-libs/flashmap/files/flashmap-respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 0000000..9d1acd6
--- /dev/null
+++ b/sys-libs/flashmap/files/flashmap-respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,103 @@
+From 8d90ed7744b23c9f7298f5422f45ea3b033cf91b Mon Sep 17 00:00:00 2001
+From: Nick Bowler <nbowler@draconx.ca>
+Date: Fri, 21 Apr 2017 15:45:17 -0400
+Subject: [PATCH 1/5] Respect CFLAGS/LDFLAGS.
+
+---
+ Makefile              | 19 ++++++++++---------
+ lib/Makefile          |  7 ++++---
+ lib/mincrypt/Makefile |  2 +-
+ 3 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 30253c3..45942c1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,9 +61,10 @@ pkgconfig_dir	= $(libdir)/pkgconfig
+ 
+ DEFS		= -DVERSION_MAJOR=$(VERSION_MAJOR)\
+                   -DVERSION_MINOR=$(VERSION_MINOR)
+-CFLAGS		+= -O2 -Wall -Werror -Wno-unused-parameter -Ilib/ $(DEFS)
++MY_CFLAGS	= -Wall -Wno-unused-parameter -Ilib/ $(DEFS)
++ALL_CFLAGS	= $(MY_CFLAGS) $(CFLAGS)
+ CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -lgcov
+-LINKOPTS	=
++LINKOPTS	= $(LDFLAGS)
+ 
+ PROGRAMS	= fmap_decode fmap_encode fmap_csum libfmap_example
+ TEST_PROGRAM	= fmap_test
+@@ -78,7 +79,7 @@ SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -
+ 
+ RELEASENAME := $(PACKAGE_NAME)-$(VERSION_MAJOR).$(VERSION_MINOR)-r$(SVNVERSION)
+ 
+-export CFLAGS
++export MY_CFLAGS
+ 
+ all: $(PROGRAMS) $(SHARED_OBJ_FILE)
+ 
+@@ -97,19 +98,19 @@ $(SRC_LIBDIR)/libfmap.a:
+ 	ar rcs $@ $(SRC_LIBDIR)/*.o
+ 
+ $(SHARED_OBJ_FILE): $(SRC_LIBDIR)/libfmap.a
+-	$(CC) -fpic -shared -Wl,-soname,$(SHARED_OBJ_SONAME) -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive
++	$(CC) $(CFLAGS) $(LINKOPTS) -shared -Wl,-soname,$(SHARED_OBJ_SONAME) -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive
+ 
+ $(PROGRAMS): $(SRC_LIBDIR)/libfmap.a
+-	$(CC) $(CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
++	$(CC) $(ALL_CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
+ 
+ # Add shared object filename to gcc command in case it's not installed already
+ $(LIBFMAP_EXAMPLE): $(SHARED_OBJ_FILE)
+-	$(CC) $(CFLAGS) $(LINKOPTS) -o $@ $@.c $(SHARED_OBJ_FILE)
++	$(CC) $(ALL_CFLAGS) $(LINKOPTS) -o $@ $@.c $(SHARED_OBJ_FILE)
+ 
+ $(TEST_PROGRAM): $(SRC_LIBDIR)/libfmap.a
+-	$(CC) $(CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
++	$(CC) $(ALL_CFLAGS) $(LINKOPTS) -I. -o $@ $@.c $^
+ 
+-test: CFLAGS += $(CFLAGS_GCOV)
++test: MY_CFLAGS += $(CFLAGS_GCOV)
+ test: $(TEST_PROGRAM)
+ 	lcov --directory . --zerocounters
+ 	@echo "Running $(TEST_PROGRAM)"
+@@ -218,4 +219,4 @@ clean: lcov-clean
+ 	@$(MAKE) -C $(SRC_LIBDIR) clean
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $^ -I. -o $@
++	$(CC) $(ALL_CFLAGS) -c $^ -I. -o $@
+diff --git a/lib/Makefile b/lib/Makefile
+index abd7ef8..bb65449 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -41,8 +41,9 @@ DEPS = $(MINCRYPT)/sha.o
+ INPUT_OBJS = input_interactive.o input_kv_pair.o
+ OBJS += $(INPUT_OBJS)
+ 
+-CFLAGS += -fpic
+-export CFLAGS
++MY_CFLAGS += -fpic
++ALL_CFLAGS = $(MY_CFLAGS) $(CFLAGS)
++export MY_CFLAGS
+ 
+ .PHONY: clean
+ clean:
+@@ -56,4 +57,4 @@ libfmap.a: $(OBJS) $(DEPS)
+ 	ar rcs $@ $+
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $^ -I. -I$(INCLUDES) -o $@
++	$(CC) $(ALL_CFLAGS) -c $^ -I. -I$(INCLUDES) -o $@
+diff --git a/lib/mincrypt/Makefile b/lib/mincrypt/Makefile
+index 6229ec0..6f54faf 100644
+--- a/lib/mincrypt/Makefile
++++ b/lib/mincrypt/Makefile
+@@ -38,4 +38,4 @@ clean:
+ 	rm -f *.o *.a
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $^ -I. -o $@
++	$(CC) $(MY_CFLAGS) $(CFLAGS) -c $^ -I. -o $@
+-- 
+2.10.2
+