mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-22 06:57:51 +00:00
Qt5: use 'git apply' to apply patches
One of the Qt5 patches is supposed to create symbolic links, which is not supported by GNU patch before version 2.7. Using 'git apply' to apply the patches solves this problem. Fixes #969.
This commit is contained in:
parent
4697e0e07d
commit
ab65a489ce
@ -59,8 +59,9 @@ $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ).verified: $(DOWNLOAD_DIR)/$(QTSCRIPTCLASS
|
|||||||
$(CONTRIB_DIR)/$(QT5): $(DOWNLOAD_DIR)/$(QT5_TGZ).verified
|
$(CONTRIB_DIR)/$(QT5): $(DOWNLOAD_DIR)/$(QT5_TGZ).verified
|
||||||
$(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QT5_TGZ) -C $(CONTRIB_DIR)
|
$(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QT5_TGZ) -C $(CONTRIB_DIR)
|
||||||
$(VERBOSE)touch $(CONTRIB_DIR)/$(QT5)
|
$(VERBOSE)touch $(CONTRIB_DIR)/$(QT5)
|
||||||
$(VERBOSE)for p in $(PATCHES); do \
|
$(VERBOSE)git init $(CONTRIB_DIR)/$(QT5)
|
||||||
patch -d $(CONTRIB_DIR)/$(QT5) -p1 -i ../../$(PATCHES_DIR)/$$p; done
|
$(VERBOSE)cd $(CONTRIB_DIR)/$(QT5) && for p in $(PATCHES); do \
|
||||||
|
git apply ../../$(PATCHES_DIR)/$$p; done;
|
||||||
|
|
||||||
$(CONTRIB_DIR)/$(QTSCRIPTCLASSIC): $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ).verified
|
$(CONTRIB_DIR)/$(QTSCRIPTCLASSIC): $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ).verified
|
||||||
$(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ) -C $(CONTRIB_DIR)
|
$(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ) -C $(CONTRIB_DIR)
|
||||||
|
Loading…
Reference in New Issue
Block a user