Skip to content

Commit

Permalink
SQUASHME pkg/oonf_api: Update build to use ld -r for submodules
Browse files Browse the repository at this point in the history
Do not make 'oonf_api' group all oonf_* objects.

I find it strange to merge modules there.
  • Loading branch information
Joakim Nohlgård authored and cladmi committed Mar 5, 2019
1 parent 1886161 commit 976b014
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
4 changes: 0 additions & 4 deletions makefiles/pseudomodules.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,4 @@ PSEUDOMODULES += crypto_aes_precalculated
# This pseudomodule causes a loop in AES to be unrolled (more flash, less CPU)
PSEUDOMODULES += crypto_aes_unroll

# declare oonf submodules as pseudomodules, but exclude oonf_api
PSEUDOMODULES += oonf_%
NO_PSEUDOMODULES += oonf_api

# Packages may also add modules to PSEUDOMODULES in their `Makefile.include`.
6 changes: 1 addition & 5 deletions pkg/oonf_api/patches/0001-add-RIOT-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ new file mode 100644
index 0000000..1f1cd9c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,28 @@
@@ -0,0 +1,24 @@
+#
+# to use oonf_api in your RIOT project,
+# add the following to your Makefile:
Expand All @@ -51,10 +51,6 @@ index 0000000..1f1cd9c
+ DIRS += external/regex
+endif
+include $(RIOTBASE)/Makefile.base
+# Build static archive from the submodule objects
+all: $(BINDIR)/$(MODULE).a
+$(patsubst %,$(BINDIR)/%.o,$(filter oonf_%,$(USEMODULE))): | ${DIRS:%=ALL--%}
+$(BINDIR)/$(MODULE).a: $(patsubst %,$(BINDIR)/%.o,$(filter oonf_%,$(USEMODULE))) | ${DIRS:%=ALL--%}
diff --git a/external/regex/Makefile b/external/regex/Makefile
new file mode 100644
index 0000000..3bc1ce1
Expand Down

0 comments on commit 976b014

Please sign in to comment.