strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#65293# use gnupatch to prevent input requests in unattended builds

Browse source
This commit is contained in:
Hans-Joachim Lankenau 2001-11-07 12:23:52 +00:00
parent 4933042e39
commit 214ce7f5b7
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
solenv/inc/tg_ext.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: tg_ext.mk,v $
#
# $Revision: 1.20 $
# $Revision: 1.21 $
#
# last change: $Author: hjs $ $Date: 2001-11-07 10:48:06 $
# last change: $Author: hjs $ $Date: 2001-11-07 13:23:02 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -145,7 +145,11 @@ $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
.IF "$(GUI)"=="WNT"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(GUI)"=="WNT"
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

6
solenv/inc/unitools.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: unitools.mk,v $
#
# $Revision: 1.10 $
# $Revision: 1.11 $
#
# last change: $Author: hjs $ $Date: 2001-09-21 16:45:47 $
# last change: $Author: hjs $ $Date: 2001-11-07 13:23:52 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -126,8 +126,10 @@ COPY=cp -f
COPYRECURSE=-r
.IF "$(OS)"=="SOLARIS"
GNUCOPY=gnucp
GNUPATCH=gnupatch
.ELSE # "$(OS)"=="SOLARIS"
GNUCOPY=cp
GNUPATCH=patch
.ENDIF # "$(OS)"=="SOLARIS"
.IF "$(OS)"=="LINUX"
GNUMAKE=make