From 4600b8a1de1bab2aaa3666e84ff92741eab54a40 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:05:24 +0000 Subject: [PATCH 1/1] 2003/09/07 10:04:15 darcs-hash:20040130070524-2ba56-0e97682c84a5530f084d98bd610ab7c0cf51e4b6.gz --- upstream/darwin-linker/patches/cctools.patch | 52 +++++++++++++++----------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/upstream/darwin-linker/patches/cctools.patch b/upstream/darwin-linker/patches/cctools.patch index ef589b5..498a051 100644 --- a/upstream/darwin-linker/patches/cctools.patch +++ b/upstream/darwin-linker/patches/cctools.patch @@ -2095,27 +2095,6 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym + return msg_result; + } +} ---- ar/Makefile 7 Sep 2002 01:27:09 -0000 1.1.1.2 -+++ ar/Makefile 7 Sep 2003 08:55:11 -0000 -@@ -2,12 +2,16 @@ - ifeq "mwccppc" "$(notdir $(CC))" - CFLAGS = -g $(OFLAG) -I$(SRCROOT)/../include - else -- CFLAGS = -g $(OFLAG) -Wall -Wno-precomp -I$(SRCROOT)/../include -+ ifeq "Linux" "$(shell uname)" -+ CFLAGS = -Wall $(X_CFLAGS) -D__LITTLE_ENDIAN__ -U__BIG_ENDIAN__ -D__ppc__ -I/usr/include -I../../macosx-include -I../include -+ else -+ CFLAGS = -g $(OFLAG) -Wall -Wno-precomp -I$(SRCROOT)/../include -+ endif - endif - - LIBSTUFF = -L$(SYMROOT)/../libstuff -lstuff - --USE_DEPENDENCY_FILE := $(shell if [ "$(notdir $(CC))" != "mwccppc" ]; then \ -+USE_DEPENDENCY_FILE := $(shell if [ `uname` != "Linux" ] && [ "$(notdir $(CC))" != "mwccppc" ]; then \ - echo YES ; else echo NO ; \ - fi; ) - --- ar/archive.c 30 Apr 2002 07:37:17 -0000 1.1.1.1 +++ ar/archive.c 7 Sep 2003 08:55:11 -0000 @@ -69,6 +69,7 @@ @@ -2314,3 +2293,34 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym +if [ -z "${USER}" ]; then USER=$(whoami); fi; + +echo "$(eval echo "${Format}")"; +--- ar/Makefile 7 Sep 2002 01:27:09 -0000 1.1.1.2 ++++ ar/Makefile 7 Sep 2003 09:03:52 -0000 +@@ -2,12 +2,16 @@ + ifeq "mwccppc" "$(notdir $(CC))" + CFLAGS = -g $(OFLAG) -I$(SRCROOT)/../include + else +- CFLAGS = -g $(OFLAG) -Wall -Wno-precomp -I$(SRCROOT)/../include ++ ifeq "Linux" "$(shell uname)" ++ CFLAGS = -Wall $(X_CFLAGS) -D__LITTLE_ENDIAN__ -U__BIG_ENDIAN__ -D__ppc__ -I/usr/include -I../../macosx-include -I../include ++ else ++ CFLAGS = -g $(OFLAG) -Wall -Wno-precomp -I$(SRCROOT)/../include ++ endif + endif + + LIBSTUFF = -L$(SYMROOT)/../libstuff -lstuff + +-USE_DEPENDENCY_FILE := $(shell if [ "$(notdir $(CC))" != "mwccppc" ]; then \ ++USE_DEPENDENCY_FILE := $(shell if [ `uname` != "Linux" ] && [ "$(notdir $(CC))" != "mwccppc" ]; then \ + echo YES ; else echo NO ; \ + fi; ) + +@@ -43,7 +47,8 @@ + $(CC) $(CFLAGS) $(RC_CFLAGS) -o $(SYMROOT)/$@ $(OBJS) $(LIBSTUFF) + + vers.c: +- vers_string -c $(VERS_STRING_FLAGS) $(PRODUCT) > $(OFILE_DIR)/$@ ++ chmod +x vers_string ++ ./vers_string -c $(VERS_STRING_FLAGS) $(PRODUCT) > $(OFILE_DIR)/$@ + + ifeq "NO" "$(USE_DEPENDENCY_FILE)" + .c.o: -- 1.7.10.4