diff options
author | Satoshi Asami <asami@FreeBSD.org> | 2000-06-08 03:25:55 +0000 |
---|---|---|
committer | Satoshi Asami <asami@FreeBSD.org> | 2000-06-08 03:25:55 +0000 |
commit | 061d6c265f0e84d0c7c83ec4b8c86368ac618381 (patch) | |
tree | 2bebf49a02235113362e1fe546359153c885e931 /devel/imake-4/files | |
parent | 1bfe1456aa1123826e1fa9706b6e4dc69822408b (diff) | |
download | ports-061d6c265f0e84d0c7c83ec4b8c86368ac618381.tar.gz ports-061d6c265f0e84d0c7c83ec4b8c86368ac618381.zip |
Notes
Diffstat (limited to 'devel/imake-4/files')
-rw-r--r-- | devel/imake-4/files/patch-c | 20 | ||||
-rw-r--r-- | devel/imake-4/files/patch-d | 30 | ||||
-rw-r--r-- | devel/imake-4/files/patch-h | 21 |
3 files changed, 71 insertions, 0 deletions
diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c new file mode 100644 index 000000000000..e11377023f74 --- /dev/null +++ b/devel/imake-4/files/patch-c @@ -0,0 +1,20 @@ +--- cf/Imake.tmpl~ Tue Feb 22 02:42:26 2000 ++++ cf/Imake.tmpl Tue Feb 22 03:11:21 2000 +@@ -1282,7 +1282,7 @@ + CXXOPTIONS = CplusplusOptions + CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) +- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) ++ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) + #endif + COMPRESS = CompressCmd + GZIPCMD = GzipCmd +@@ -1469,7 +1469,7 @@ + */ + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) +- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) ++ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = LdPreLib + LDPOSTLIB = LdPostLib diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d new file mode 100644 index 000000000000..3cbdc25d510c --- /dev/null +++ b/devel/imake-4/files/patch-d @@ -0,0 +1,30 @@ +--- cf/FreeBSD.cf.orig Thu Feb 17 18:09:43 2000 ++++ cf/FreeBSD.cf Sat Mar 18 19:42:06 2000 +@@ -336,14 +336,14 @@ + /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ + #ifndef DefaultGcc2i386Opt + #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) +-#define DefaultGcc2i386Opt -O2 ++#define DefaultGcc2i386Opt + #endif + #endif + + #ifdef i386Architecture + # define OptimizedCDebugFlags DefaultGcc2i386Opt + #else +-# define OptimizedCDebugFlags -O ++# define OptimizedCDebugFlags + #endif + + #ifndef PreIncDir +@@ -463,8 +463,9 @@ + /* + * A hack to work around an optimisation problem with the compiler on + * FreeBSD 4.0-current in late 1999/early 2000. ++ * (and FreeBSD 5.0-current in early 2000) + */ +-#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0 ++#if (OSMajorVersion == 4 || OSMajorVersion == 5) && OSMinorVersion == 0 && OSTeenyVersion == 0 + #define FreeBSDGccOptBug + #endif + diff --git a/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h new file mode 100644 index 000000000000..c3f02dccd53b --- /dev/null +++ b/devel/imake-4/files/patch-h @@ -0,0 +1,21 @@ +--- cf/Imake.rules.orig Wed Mar 8 00:54:17 2000 ++++ cf/Imake.rules Wed Apr 12 18:00:00 2000 +@@ -1437,7 +1437,7 @@ + MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ + @MakeFlagsToShellFlags(i,set +e); \ @@\ + if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ +- RELPATH=`echo opath/cdir | \ @@\ ++ RELPATH=`cd opath/cdir; pwd | \ @@\ + sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ + cd Concat($(DESTDIR),opath/cdir); \ @@\ + if [ -d rdir -a ! -h rdir ]; then \ @@\ +@@ -1484,7 +1484,7 @@ + MakeDir(Concat($(DESTDIR),npath)) @@\ + @MakeFlagsToShellFlags(i,set +e); \ @@\ + if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ +- RELPATH=`echo opath | \ @@\ ++ RELPATH=`cd opath; pwd | \ @@\ + sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ + cd Concat($(DESTDIR),opath); \ @@\ + if [ -f lfile -a ! -h lfile ]; then \ @@\ + |