Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
poprouting: Fix build with external toolchains
The Makefile would not consistently honour CFLAGS or LDFLAGS, and we were not correctly setting them in the OpenWrt/LEDE Makefile either. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
- Loading branch information
Showing
2 changed files
with
31 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From dda5c5a0cd2204816f2f83f18e7820ded6c962df Mon Sep 17 00:00:00 2001 | ||
From: Florian Fainelli <f.fainelli@gmail.com> | ||
Date: Mon, 5 Jun 2017 17:30:24 -0700 | ||
Subject: [PATCH] Honor CFLAGS and LDFLAGS when passed | ||
|
||
--- | ||
Makefile | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
Index: prince-v0.3.1/Makefile | ||
=================================================================== | ||
--- prince-v0.3.1.orig/Makefile | ||
+++ prince-v0.3.1/Makefile | ||
@@ -1,11 +1,11 @@ | ||
CFLAGS+=-lm -ldl -ljson-c -pthread | ||
poprouting:out libs | ||
cp prince/src/common_c.h prince/src/common.h | ||
- $(CC) $(LDFLAGS) prince/src/prince.c prince/src/lib/ini.c prince/src/parser.c prince/src/socket.c graph-parser_c/src/brandes.c graph-parser_c/src/biconnected.c graph-parser_c/src/graph_parser.c graph-parser_c/src/graph/graph.c graph-parser_c/src/graph/list.c graph-parser_c/src/network_change.c -o output/prince $(CFLAGS) | ||
+ $(CC) $(LDFLAGS) $(CFLAGS) prince/src/prince.c prince/src/lib/ini.c prince/src/parser.c prince/src/socket.c graph-parser_c/src/brandes.c graph-parser_c/src/biconnected.c graph-parser_c/src/graph_parser.c graph-parser_c/src/graph/graph.c graph-parser_c/src/graph/list.c graph-parser_c/src/network_change.c -o output/prince | ||
rm prince/src/common.h | ||
libs: | ||
cp prince/src/common_c.h prince/src/common.h | ||
- $(CC) -shared -fPIC -o output/libprince_oonf_c.so prince/src/oonf.c prince/src/socket.c prince/src/parser.c graph-parser_c/src/brandes.c graph-parser_c/src/biconnected.c graph-parser_c/src/graph_parser.c graph-parser_c/src/graph/graph.c graph-parser_c/src/graph/list.c graph-parser_c/src/network_change.c | ||
+ $(CC) $(LDFLAGS) $(CFLAGS) -shared -fPIC -o output/libprince_oonf_c.so prince/src/oonf.c prince/src/socket.c prince/src/parser.c graph-parser_c/src/brandes.c graph-parser_c/src/biconnected.c graph-parser_c/src/graph_parser.c graph-parser_c/src/graph/graph.c graph-parser_c/src/graph/list.c graph-parser_c/src/network_change.c | ||
clean: | ||
rm output/* | ||
|