projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace fixes
[openwrt.git]
/
package
/
rules.mk
diff --git
a/package/rules.mk
b/package/rules.mk
index
4999974
..
d44cd98
100644
(file)
--- a/
package/rules.mk
+++ b/
package/rules.mk
@@
-6,12
+6,16
@@
endif
define Build/DefaultTargets
ifeq ($(DUMP),)
define Build/DefaultTargets
ifeq ($(DUMP),)
- ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . | tee /tmp/xy1),.)
- $(PKG_BUILD_DIR)/.prepared: package-clean
+ ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR))
+ ifeq ($(CONFIG_AUTOREBUILD),y)
+ $(PKG_BUILD_DIR)/.prepared: package-clean
+ endif
endif
endif
- ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/xy2),$(IPKG_$(1)))
- $(PKG_BUILD_DIR)/.built: package-rebuild
+ ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
+ ifeq ($(CONFIG_AUTOREBUILD),y)
+ $(PKG_BUILD_DIR)/.built: package-rebuild
+ endif
endif
endif
endif
endif
@@
-28,14
+32,19
@@
define Build/DefaultTargets
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(call Build/Compile)
touch $$@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(call Build/Compile)
touch $$@
-
- $(
PKG_BUILD_DIR)/.dev
-installed: $(PKG_BUILD_DIR)/.built
+
+ $(
STAGING_DIR)/stampfiles/.$(PKG_NAME)
-installed: $(PKG_BUILD_DIR)/.built
$(call Build/InstallDev)
touch $$@
$(call Build/InstallDev)
touch $$@
-
+
+ ifdef Build/InstallDev
+ compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+ endif
+
package-clean: FORCE
$(call Build/Clean)
$(call Build/UninstallDev)
package-clean: FORCE
$(call Build/Clean)
$(call Build/UninstallDev)
+ rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
package-rebuild: FORCE
@-rm $(PKG_BUILD_DIR)/.built
package-rebuild: FORCE
@-rm $(PKG_BUILD_DIR)/.built
@@
-49,10
+58,17
@@
define Package/Default
SECTION:=opt
CATEGORY:=Extra packages
DEPENDS:=
SECTION:=opt
CATEGORY:=Extra packages
DEPENDS:=
- NEEDS:=
MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
- VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+ ifneq ($(PKG_VERSION),)
+ ifneq ($(PKG_RELEASE),)
+ VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+ else
+ VERSION:=$(PKG_VERSION)
+ endif
+ else
+ VERSION:=$(PKG_RELEASE)
+ endif
PKGARCH:=$(ARCH)
PRIORITY:=optional
DEFAULT:=
PKGARCH:=$(ARCH)
PRIORITY:=optional
DEFAULT:=
@@
-92,7
+108,6
@@
define BuildPackage
endif
IDEPEND_$(1):=$$(strip $$(DEPENDS))
endif
IDEPEND_$(1):=$$(strip $$(DEPENDS))
- INEED_$(1):=$$(strip $$(NEEDS))
DUMPINFO += \
echo "Package: $(1)";
DUMPINFO += \
echo "Package: $(1)";
@@
-110,7
+125,7
@@
define BuildPackage
DUMPINFO += \
echo "Version: $(VERSION)"; \
echo "Depends: $$(IDEPEND_$(1))"; \
DUMPINFO += \
echo "Version: $(VERSION)"; \
echo "Depends: $$(IDEPEND_$(1))"; \
- echo "
Needs: $$(INEED_$(1)
)"; \
+ echo "
Build-Depends: $(PKG_BUILDDEP
)"; \
echo "Category: $(CATEGORY)"; \
echo "Title: $(TITLE)"; \
echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
echo "Category: $(CATEGORY)"; \
echo "Title: $(TITLE)"; \
echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
@@
-134,7
+149,13
@@
define BuildPackage
mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
- echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control
+ ( \
+ DEPENDS=; \
+ for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
+ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
+ done; \
+ echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
+ )
echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
@@
-149,14
+170,15
@@
define BuildPackage
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
$(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR)
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
$(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR)
+ -find $$(IDIR_$(1)) -name CVS | xargs rm -rf
+ -find $$(IDIR_$(1)) -name .svn | xargs rm -rf
+ -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
$(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
$$(INFO_$(1)): $$(IPKG_$(1))
$(IPKG) install $$(IPKG_$(1))
$(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
$$(INFO_$(1)): $$(IPKG_$(1))
$(IPKG) install $$(IPKG_$(1))
- compile-targets: $(PKG_BUILD_DIR)/.dev-installed
-
$(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_*
$(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_*
@@
-223,12
+245,11
@@
endef
define Build/Compile/Default
$(MAKE) -C $(PKG_BUILD_DIR) \
define Build/Compile/Default
$(MAKE) -C $(PKG_BUILD_DIR) \
+ $(TARGET_CONFIGURE_OPTS) \
CC=$(TARGET_CC) \
CROSS="$(TARGET_CROSS)" \
CC=$(TARGET_CC) \
CROSS="$(TARGET_CROSS)" \
- PREFIX="$$(IDIR_$(1))" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
ARCH="$(ARCH)" \
ARCH="$(ARCH)" \
- DESTDIR="$$(IDIR_$(1))" \
$(1);
endef
$(1);
endef
@@
-236,16
+257,10
@@
define Build/Compile
$(call Build/Compile/Default,)
endef
$(call Build/Compile/Default,)
endef
-define Build/InstallDev
-endef
-
define Build/Clean
$(MAKE) clean
endef
define Build/Clean
$(MAKE) clean
endef
-define Build/UninstallDev
-endef
-
ifneq ($(DUMP),)
dumpinfo: FORCE
@$(DUMPINFO)
ifneq ($(DUMP),)
dumpinfo: FORCE
@$(DUMPINFO)
This page took
0.028161 seconds
and
4
git commands to generate.