rendered paste bodyIndex: package/sdk/files/rules.mk
===================================================================
--- package/sdk/files/rules.mk (revision 6230)
+++ package/sdk/files/rules.mk (working copy)
@@ -43,7 +43,7 @@
IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
+TARGET_PATH:=$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
export PATH:=$(TARGET_PATH)
@@ -70,6 +70,9 @@
TARGET_CC:= ccache $(TARGET_CC)
endif
+EXTRA_CPPFLAGS:= -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_LDFLAGS:= -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+
TARGET_CONFIGURE_OPTS:= \
AR=$(TARGET_CROSS)ar \
AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
@@ -79,7 +82,8 @@
GCC="$(TARGET_CC)" \
CXX=$(TARGET_CROSS)g++ \
RANLIB=$(TARGET_CROSS)ranlib \
- STRIP=$(TARGET_CROSS)strip
+ STRIP=$(TARGET_CROSS)strip \
+ OBJCOPY=$(TARGET_CROSS)objcopy
# strip an entire directory
RSTRIP:= \
Index: package/sdk/files/include/package.mk
===================================================================
--- package/sdk/files/include/package.mk (revision 6230)
+++ package/sdk/files/include/package.mk (working copy)
@@ -14,6 +14,7 @@
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/unpack.mk
+PKG_CONFIG_PATH:=.
export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
define shvar
@@ -287,9 +288,10 @@
CXXFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
$(2) \
- ./configure \
+ $(PKG_CONFIG_PATH)/configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@ -316,11 +318,12 @@
endef
define Build/Compile/Default
+ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
+ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
+ LDFLAGS="$(EXTRA_LDFLAGS) " \
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CROSS="$(TARGET_CROSS)" \
- 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)" \
$(1);
endef