* restore compatibility with old bison * disable versioned symbols - the -current ld has a problem with them * fix an instance of improper shell quoting * the SIGPIPE hack inside tar needs a sh not csh (fixes PR#15706) - pth>=1.4.0nb1 is a runtime dependency - our csh is sufficient for compilation
25 lines
1.2 KiB
Text
25 lines
1.2 KiB
Text
$NetBSD: patch-by,v 1.2 2002/02/26 21:25:28 mrauch Exp $
|
|
|
|
--- ../solenv/inc/tg_ext.mk.orig Sun Feb 24 14:08:59 2002
|
|
+++ ../solenv/inc/tg_ext.mk
|
|
@@ -107,7 +107,7 @@
|
|
|
|
$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz
|
|
@+-$(RM) $@
|
|
- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV)
|
|
+ @+echo $(assign UNPACKCMD := sh -c "gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf -" ) > $(NULLDEV)
|
|
@+$(COPY) $(mktmp $(UNPACKCMD)) $@
|
|
|
|
$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
|
|
@@ -145,7 +145,11 @@
|
|
.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 "$(OS)"=="NETBSD"
|
|
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
|
|
+.ELSE
|
|
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
|
|
+.ENDIF # "$(OS)"=="NETBSD"
|
|
.ENDIF # "$(GUI)"=="WNT"
|
|
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""
|
|
|