bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] git: prevent spurious rebuilds caused by $(MAKE) ... install being called in Package/git/install, use PKG_INSTALL instead

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@20730 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico
2010-04-06 09:14:51 +00:00
parent 3ce7e139d5
commit fa4a738db8
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
net/git/Makefile
View File

@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@KERNEL/software/scm/git PKG_SOURCE_URL:=@KERNEL/software/scm/git
PKG_MD5SUM:=03aefaaecae7a236b88d04d1a83698d9 PKG_MD5SUM:=03aefaaecae7a236b88d04d1a83698d9
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/git define Package/git
@ -33,6 +35,20 @@ define Package/git/description
with speed and efficiency. with speed and efficiency.
endef endef
MAKE_FLAGS := \
CC="$(TARGET_CC)" \
LD="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
NO_PERL="YesPlease" \
NO_EXPAT="YesPlease" \
NO_WISH="YesPlease" \
NO_ICONV="YesPlease" \
NO_NSEC="YesPlease" \
NO_CURL="YesPlease" \
NO_TCLTK="YesPlease" \
define Build/Configure define Build/Configure
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
configure configure
@ -43,39 +59,9 @@ define Build/Configure
); );
endef endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
LD="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
NO_PERL="YesPlease" \
NO_EXPAT="YesPlease" \
NO_WISH="YesPlease" \
NO_ICONV="YesPlease" \
NO_NSEC="YesPlease" \
NO_CURL="YesPlease" \
NO_TCLTK="YesPlease" \
all
endef
define Package/git/install define Package/git/install
$(MAKE) -C $(PKG_BUILD_DIR) \ $(INSTALL_DIR) $(1)
DESTDIR="$(1)" \ $(CP) $(PKG_INSTALL_DIR)/* $(1)/
CC="$(TARGET_CC)" \
LD="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
NO_PERL="YesPlease" \
NO_EXPAT="YesPlease" \
NO_WISH="YesPlease" \
NO_ICONV="YesPlease" \
NO_NSEC="YesPlease" \
NO_CURL="YesPlease" \
NO_TCLTK="YesPlease" \
install
endef endef
$(eval $(call BuildPackage,git)) $(eval $(call BuildPackage,git))