Skip to contentSkip to conversation

batman-adv-devel: Don't overwrite batctl's CFLAGS

PATCH Applied Sven Eckelmann 2 participants 4 messages May 8, 2013 – May 12, 2013

lore
Share & tools
lore
#0 lore raw

The batctl makefile has CFLAGS which change the behavior of the compiler. This includes important things like the C-dialect used or whether the compiler can ignore aliasing problems during the optimization step.

The OpenWRT build environment should not overwrite these settings without a good reason. Most of these reasons can probably directly be fixed upstream.

---
 batman-adv-devel/Makefile | 3 ---
 1 file changed, 3 deletions(-)
batman-adv-devel/Makefile +0 -3
index cad95c6..fb2c24a 100644
@@ -65,9 +65,6 @@ MAKE_BATMAN_ADV_ARGS += \
 	REVISION="$(PKG_BATMAN_SHORTREV)" all
 
 MAKE_BATCTL_ARGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CCFLAGS="$(TARGET_CFLAGS)" \
-	OFLAGS="$(TARGET_CFLAGS)" \
 	REVISION="$(PKG_BATCTL_SHORTREV)" \
 	CC="$(TARGET_CC)" \
 	NODEBUG=1 \
Signature · 1 line
1.8.2.1
#1 lore raw

[B.A.T.M.A.N.] [Bonus-PATCH 11/9] batman-adv-devel: Remove unused parameters from MAKE_BATCTL_ARGS

The NODEBUG, UNAME and STRIP parameter aren't used in batctl's Makefile. Removing them should be safe.

---
 batman-adv-devel/Makefile | 3 ---
 1 file changed, 3 deletions(-)
batman-adv-devel/Makefile +0 -3
index fb2c24a..4689181 100644
@@ -67,10 +67,7 @@ MAKE_BATMAN_ADV_ARGS += \
 MAKE_BATCTL_ARGS += \
 	REVISION="$(PKG_BATCTL_SHORTREV)" \
 	CC="$(TARGET_CC)" \
-	NODEBUG=1 \
-	UNAME="Linux" \
 	DESTDIR="$(PKG_INSTALL_DIR)" \
-	STRIP="/bin/true" \
 	batctl install
 
 TARGET_CFLAGS  += -ffunction-sections -fdata-sections -flto
Signature · 1 line
1.8.2.1
#2 lore raw

Re: [B.A.T.M.A.N.] [Bonus-PATCH 11/9] batman-adv-devel: Remove unused parameters from MAKE_BATCTL_ARGS

Quoted 7 lines · On Wednesday, May 08, 2013 15:21:26 Sven Eckelmann wrote:

The NODEBUG, UNAME and STRIP parameter aren't used in batctl's Makefile. Removing them should be safe.

---
 batman-adv-devel/Makefile | 3 ---
 1 file changed, 3 deletions(-)

Applied in revision ffa6898.

Thanks,
Marek

#3 lore raw
In reply to Sven Eckelmann
Quoted 11 lines · On Wednesday, May 08, 2013 15:21:25 Sven Eckelmann wrote:

The batctl makefile has CFLAGS which change the behavior of the compiler. This includes important things like the C-dialect used or whether the compiler can ignore aliasing problems during the optimization step.

The OpenWRT build environment should not overwrite these settings without a good reason. Most of these reasons can probably directly be fixed upstream.

---
 batman-adv-devel/Makefile | 3 ---
 1 file changed, 3 deletions(-)

Applied in revision 110ca73.

Thanks,
Marek