Pileus Git - ~andy/sunrise/blob - dev-lang/dmd/files/dmd-2.054-makefile.patch

   1 --- dmd2.054/src/dmd/posix.mak.orig     2011-07-10 22:19:30.000000000 +0200
   2 +++ dmd2.054/src/dmd/posix.mak  2011-07-22 19:39:07.797180890 +0200
   3 @@ -28,7 +28,7 @@ C=backend
   4  TK=tk
   5  ROOT=root
   6
   7 -MODEL=32
   8 +MODEL?=32
   9
  10  ifeq (OSX,$(TARGET))
  11      ## See: http://developer.apple.com/documentation/developertools/conceptual/cross_development/Using/chapter_3_section_2.html#//apple_ref/doc/uid/20002000-1114311-BABGCAAB
  12 --- dmd2/src/druntime/posix.mak.orig    2011-06-25 02:39:28.000000000 +0200
  13 +++ dmd2/src/druntime/posix.mak 2011-07-22 17:42:40.570533111 +0200
  14 @@ -20,21 +20,21 @@ ifeq (,$(OS))
  15      endif
  16  endif
  17
  18 -DMD=dmd
  19 +DMD?=dmd
  20
  21  DOCDIR=doc
  22  IMPDIR=import
  23
  24 -MODEL=32
  25 +MODEL?=32
  26
  27  DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport
  28  UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport
  29
  30  CFLAGS=-m$(MODEL) -O
  31
  32 -OBJDIR=obj
  33 +OBJDIR=obj$(MODEL)
  34  DRUNTIME_BASE=druntime
  35 -DRUNTIME=lib/lib$(DRUNTIME_BASE).a
  36 +DRUNTIME=lib$(MODEL)/lib$(DRUNTIME_BASE).a
  37
  38  DOCFMT=
  39
  40 --- dmd2/src/phobos/etc/c/zlib/gzio.c.orig      2011-07-26 23:58:57.240222466 +0200
  41 +++ dmd2/src/phobos/etc/c/zlib/gzio.c   2011-07-26 23:59:20.136336207 +0200
  42 @@ -8,6 +8,7 @@
  43  /* @(#) $Id$ */
  44
  45  #include <stdio.h>
  46 +#include <errno.h>
  47
  48  #include "zutil.h"
  49
  50 --- dmd2/src/phobos/posix.mak.orig      2011-07-10 22:19:30.000000000 +0200
  51 +++ dmd2/src/phobos/posix.mak   2011-07-22 17:51:00.901014107 +0200
  52 @@ -48,7 +48,7 @@ endif
  53  DRUNTIME_PATH = ../druntime
  54  ZIPFILE = phobos.zip
  55  ROOT_OF_THEM_ALL = generated
  56 -ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)/$(MODEL)
  57 +ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)$(MODEL)
  58  # Documentation-related stuff
  59  DOCSRC = ../d-programming-language.org
  60  WEBSITE_DIR = ../web
  61 @@ -61,8 +61,6 @@ DDOCFLAGS=-m$(MODEL) -d -c -o- -version=
  62
  63  # Variable defined in an OS-dependent manner (see below)
  64  CC =
  65 -DMD =
  66 -DDOC =
  67  CFLAGS =
  68  DFLAGS =
  69
  70 @@ -75,7 +73,7 @@ MAKEFILE:=$(lastword $(MAKEFILE_LIST))
  71
  72  # Set DRUNTIME name and full path
  73  ifeq (,$(findstring win,$(OS)))
  74 -       DRUNTIME = $(DRUNTIME_PATH)/lib/libdruntime.a
  75 +       DRUNTIME = $(DRUNTIME_PATH)/lib$(MODEL)/libdruntime.a
  76  else
  77         DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib
  78  endif
  79 @@ -83,14 +81,14 @@ endif
  80  # Set CC and DMD
  81  ifeq ($(OS),win32wine)
  82         CC = wine dmc.exe
  83 -       DMD = wine dmd.exe
  84 +       DMD ?= wine dmd.exe
  85         RUN = wine
  86  else
  87         ifeq ($(OS),win32remote)
  88 -               DMD = ssh 206.125.170.138 "cd code/dmd/phobos && dmd"
  89 +               DMD ?= ssh 206.125.170.138 "cd code/dmd/phobos && dmd"
  90                 CC = ssh 206.125.170.138 "cd code/dmd/phobos && dmc"
  91         else
  92 -               DMD = dmd
  93 +               DMD ?= dmd
  94                 ifeq ($(OS),win32)
  95                         CC = dmc
  96                 else
  97 @@ -141,7 +139,7 @@ else
  98  endif
  99
 100  # Set DDOC, the documentation generator
 101 -DDOC=dmd
 102 +DDOC?=$(DMD)
 103
 104  # Set LIB, the ultimate target
 105  ifeq (,$(findstring win,$(OS)))
 106