KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add CXXFLAGS and PKG_CONFIG_PATH in Build/Configure/Default, add EXTRA_LDFLAGS in Build/Compile/Default, use consistent search order for includes in CFLAGS.

Browse source 
SVN-Revision: 4849
This commit is contained in:
Nicolas Thill 2006-09-24 02:09:45 +00:00
parent 8312ad091c
commit ff06a061f1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
openwrt/include/package.mk
View file

@ -271,12 +271,14 @@ define Build/Prepare
endef endef
define Build/Configure/Default define Build/Configure/Default
@(cd $(PKG_BUILD_DIR)/$(3); \ (cd $(PKG_BUILD_DIR)/$(3); \
if [ -x configure ]; then \ if [ -x configure ]; then \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
$(2) \ $(2) \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
@ -308,7 +310,8 @@ define Build/Compile/Default
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CROSS="$(TARGET_CROSS)" \ CROSS="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \
EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
ARCH="$(ARCH)" \ ARCH="$(ARCH)" \
$(1); $(1);
endef endef