projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up reject files after copying target/linux/*/files to the kernel tree
[openwrt.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index
16d9ae0
..
d8e8228
100644
(file)
--- a/
include/package-defaults.mk
+++ b/
include/package-defaults.mk
@@
-30,7
+30,7
@@
define Package/Default
SUBMENU:=
SUBMENUDEP:=
TITLE:=
SUBMENU:=
SUBMENUDEP:=
TITLE:=
-
DESCRIPTION
:=
+
KCONFIG
:=
endef
Build/Patch:=$(Build/Patch/Default)
endef
Build/Patch:=$(Build/Patch/Default)
@@
-38,28
+38,27
@@
ifneq ($(strip $(PKG_UNPACK)),)
define Build/Prepare/Default
$(PKG_UNPACK)
$(Build/Patch)
define Build/Prepare/Default
$(PKG_UNPACK)
$(Build/Patch)
+ $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
endef
endif
endef
endif
-TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-
+CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
- --prefix=
/usr
\
- --exec-prefix=
/usr
\
- --bindir=
/usr
/bin \
- --sbindir=
/usr
/sbin \
- --libexecdir=
/usr
/lib \
+ --prefix=
$(CONFIGURE_PREFIX)
\
+ --exec-prefix=
$(CONFIGURE_PREFIX)
\
+ --bindir=
$(CONFIGURE_PREFIX)
/bin \
+ --sbindir=
$(CONFIGURE_PREFIX)
/sbin \
+ --libexecdir=
$(CONFIGURE_PREFIX)
/lib \
--sysconfdir=/etc \
--sysconfdir=/etc \
- --datadir=
/usr
/share \
+ --datadir=
$(CONFIGURE_PREFIX)
/share \
--localstatedir=/var \
--localstatedir=/var \
- --mandir=
/usr
/man \
- --infodir=
/usr
/info \
+ --mandir=
$(CONFIGURE_PREFIX)
/man \
+ --infodir=
$(CONFIGURE_PREFIX)
/info \
$(DISABLE_NLS)
CONFIGURE_VARS = \
$(DISABLE_NLS)
CONFIGURE_VARS = \
@@
-67,8
+66,8
@@
CONFIGURE_VARS = \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+ 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"
CONFIGURE_PATH = .
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
CONFIGURE_PATH = .
@@
-77,6
+76,7
@@
CONFIGURE_CMD = ./configure
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)/ && \
$(CONFIGURE_VARS) \
$(2) \
$(CONFIGURE_CMD) \
$(CONFIGURE_VARS) \
$(2) \
$(CONFIGURE_CMD) \
@@
-87,9
+87,9
@@
define Build/Configure/Default
endef
MAKE_VARS = \
endef
MAKE_VARS = \
- CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
- CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
- LDFLAGS="$(
EXTRA_LDFLAGS)
"
+ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)
$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)
" \
+ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)
$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)
" \
+ LDFLAGS="$(
TARGET_LDFLAGS) $(EXTRA_LDFLAGS)
"
MAKE_FLAGS = \
$(TARGET_CONFIGURE_OPTS) \
MAKE_FLAGS = \
$(TARGET_CONFIGURE_OPTS) \
@@
-104,5
+104,3
@@
define Build/Compile/Default
$(MAKE_FLAGS) \
$(1);
endef
$(MAKE_FLAGS) \
$(1);
endef
-
-
This page took
0.023064 seconds
and
4
git commands to generate.