• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
Thomas PetazzoniThomas Petazzoni committed 45bdad14e6401 Jul 2017
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
From 5c5e6d0f469c8b4384bbe5d6c8f78069c182daf0 Mon Sep 17 00:00:00 2001
2
From: Romain Naour <romain.naour@gmail.com>
3
Date: Sun, 9 Apr 2017 19:56:55 +0200
4
Subject: [PATCH] override CPPFLAGS, CXXFLAGS and CFLAGS in Makefile
5
​
6
When CPPFLAGS is passed on the command line, include paths for the
7
bundled libraries are lost. Since the hand written Makefile want
8
to use them unconditionally, we need to use the key word "override"
9
before CPPFLAGS.
10
​
11
Do the same for CXXFLAGS and CFLAGS otherwise -fPIC is lost.
12
​
13
Signed-off-by: Romain Naour <romain.naour@gmail.com>
14
---
15
 source/Irrlicht/Makefile | 6 +++---
16
 1 file changed, 3 insertions(+), 3 deletions(-)
17
​
18
diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
19
index 0712b07..b334e9c 100644
20
--- a/source/Irrlicht/Makefile
21
+++ b/source/Irrlicht/Makefile
22
@@ -62,7 +62,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
23
 ###############
24
 #Compiler flags
25
 CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
26
-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
27
+override CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
28
 CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
29
 ifndef NDEBUG
30
 CXXFLAGS += -g -D_DEBUG
31
@@ -74,8 +74,8 @@ CXXFLAGS += -pg
32
 endif
33
 CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
34
 
35
-sharedlib sharedlib_osx: CXXFLAGS += -fPIC
36
-sharedlib sharedlib_osx: CFLAGS += -fPIC
37
+sharedlib sharedlib_osx: override CXXFLAGS += -fPIC
38
+sharedlib sharedlib_osx: override CFLAGS += -fPIC
39
 
40
 #multilib handling
41
 ifeq ($(HOSTTYPE), x86_64)
42
-- 
43
2.9.3
44
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.