projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove madwifi-testing (it confuses users) - it doesn't work, never has, and i'm...
[openwrt.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index
d8e8228
..
c086cc2
100644
(file)
--- a/
include/package-defaults.mk
+++ b/
include/package-defaults.mk
@@
-42,6
+42,9
@@
ifneq ($(strip $(PKG_UNPACK)),)
endef
endif
endef
endif
+export PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR_HOST)/usr/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig
+
CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \
CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \
@@
-67,16
+70,19
@@
CONFIGURE_VARS = \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
- PKG_CONFIG_PATH="$(
STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR_HOST)/usr/lib/pkgconfig
" \
- PKG_CONFIG_LIBDIR="$(
STAGING_DIR)/usr/lib/pkgconfig
"
+ PKG_CONFIG_PATH="$(
PKG_CONFIG_PATH)
" \
+ PKG_CONFIG_LIBDIR="$(
PKG_CONFIG_LIBDIR)
"
CONFIGURE_PATH = .
CONFIGURE_CMD = ./configure
CONFIGURE_PATH = .
CONFIGURE_CMD = ./configure
+replace_script=$(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2);
+
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
if [ -x $(CONFIGURE_CMD) ]; then \
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
if [ -x $(CONFIGURE_CMD) ]; then \
- $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \
+ $(call replace_script,$(PKG_BUILD_DIR)/$(3),config.guess) \
+ $(call replace_script,$(PKG_BUILD_DIR)/$(3),config.sub) \
$(CONFIGURE_VARS) \
$(2) \
$(CONFIGURE_CMD) \
$(CONFIGURE_VARS) \
$(2) \
$(CONFIGURE_CMD) \
@@
-96,6
+102,10
@@
MAKE_FLAGS = \
CROSS="$(TARGET_CROSS)" \
ARCH="$(ARCH)"
CROSS="$(TARGET_CROSS)" \
ARCH="$(ARCH)"
+MAKE_INSTALL_FLAGS = \
+ $(MAKE_FLAGS) \
+ DESTDIR="$(PKG_INSTALL_DIR)"
+
MAKE_PATH = .
define Build/Compile/Default
MAKE_PATH = .
define Build/Compile/Default
@@
-104,3
+114,10
@@
define Build/Compile/Default
$(MAKE_FLAGS) \
$(1);
endef
$(MAKE_FLAGS) \
$(1);
endef
+
+define Build/Install/Default
+ $(MAKE_VARS) \
+ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+ $(MAKE_INSTALL_FLAGS) \
+ $(1) install;
+endef
This page took
0.030582 seconds
and
4
git commands to generate.