svn commit: r547434 - in head/misc/otter: . files
Stefan Eßer
se at FreeBSD.org
Thu Sep 3 09:41:21 UTC 2020
Author: se
Date: Thu Sep 3 09:41:20 2020
New Revision: 547434
URL: https://svnweb.freebsd.org/changeset/ports/547434
Log:
Fix build with -fno-common
Added:
head/misc/otter/files/
head/misc/otter/files/patch-mace2_Mace2.h (contents, props changed)
head/misc/otter/files/patch-mace2_Makefile (contents, props changed)
head/misc/otter/files/patch-mace2_anldp.c (contents, props changed)
head/misc/otter/files/patch-mace2_mace2.c (contents, props changed)
head/misc/otter/files/patch-mace2_stats.c (contents, props changed)
Modified:
head/misc/otter/Makefile
Modified: head/misc/otter/Makefile
==============================================================================
--- head/misc/otter/Makefile Thu Sep 3 09:36:46 2020 (r547433)
+++ head/misc/otter/Makefile Thu Sep 3 09:41:20 2020 (r547434)
@@ -3,7 +3,7 @@
PORTNAME= otter
PORTVERSION= 3.3f
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://www-unix.mcs.anl.gov/AR/otter/dist33/
Added: head/misc/otter/files/patch-mace2_Mace2.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/otter/files/patch-mace2_Mace2.h Thu Sep 3 09:41:20 2020 (r547434)
@@ -0,0 +1,11 @@
+--- mace2/Mace2.h.orig 2004-06-30 02:04:58 UTC
++++ mace2/Mace2.h
+@@ -3,7 +3,7 @@
+
+ /************ BASIC INCLUDES ************/
+
+-#define IN_MAIN /* so that global vars in ../header.h will not be external */
++// #define IN_MAIN /* so that global vars in ../header.h will not be external */
+ #include "../source/header.h" /* Otter header */
+
+ #include "Opts.h"
Added: head/misc/otter/files/patch-mace2_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/otter/files/patch-mace2_Makefile Thu Sep 3 09:41:20 2020 (r547434)
@@ -0,0 +1,22 @@
+--- mace2/Makefile.orig 2004-02-09 20:30:15 UTC
++++ mace2/Makefile
+@@ -1,8 +1,8 @@
+ DFLAGS = -DTP_NAMES -DTP_SIGNAL -DTP_RUSAGE
+
+-CC = gcc
++CC ?= gcc
+
+-CFLAGS = -O $(DFLAGS)
++CFLAGS += $(DFLAGS)
+
+ # CFLAGS = -g $(DFLAGS)
+
+@@ -23,7 +23,7 @@ anldp: anldp.o $(OBJECTS)
+ mace2.o anldp.o $(OBJECTS): Mace2.h Clock.h Avail.h Opts.h Stats.h\
+ Miscellany.h Dp.h Generate.h Flatten.h Part.h
+
+-install:
++install: mace2 anldp mace2 anldp
+ /bin/mv mace2 anldp ../bin
+
+ clean:
Added: head/misc/otter/files/patch-mace2_anldp.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/otter/files/patch-mace2_anldp.c Thu Sep 3 09:41:20 2020 (r547434)
@@ -0,0 +1,13 @@
+--- mace2/anldp.c.orig 2003-08-06 18:43:36 UTC
++++ mace2/anldp.c
+@@ -41,6 +41,10 @@
+
+ /************* END OF ALL GLOBAL CONSTANT DEFINITIONS ****************/
+
++#define IN_MAIN
++
++#include "../source/header.h"
++
+ #include "Opts.h"
+ #include "Stats.h"
+ #include "Avail.h"
Added: head/misc/otter/files/patch-mace2_mace2.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/otter/files/patch-mace2_mace2.c Thu Sep 3 09:41:20 2020 (r547434)
@@ -0,0 +1,11 @@
+--- mace2/mace2.c.orig 2004-08-02 20:07:00 UTC
++++ mace2/mace2.c
+@@ -14,6 +14,8 @@
+ #define VERSION "2.2f"
+ #define VDATE "August 2004"
+
++#define IN_MAIN
++
+ #include "Mace2.h"
+
+ #include <unistd.h> /* for getopt */
Added: head/misc/otter/files/patch-mace2_stats.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/otter/files/patch-mace2_stats.c Thu Sep 3 09:41:20 2020 (r547434)
@@ -0,0 +1,14 @@
+--- mace2/stats.c.orig 2003-08-06 14:17:44 UTC
++++ mace2/stats.c
+@@ -1,8 +1,8 @@
+ #include "Mace2.h"
+
+- long MACE_Stats[MACE_MAX_STATS];
+- struct MACE_clock MACE_Clocks[MACE_MAX_CLOCKS];
+- int Internal_flags[MAX_INTERNAL_FLAGS];
++long MACE_Stats[MACE_MAX_STATS];
++extern struct MACE_clock MACE_Clocks[MACE_MAX_CLOCKS];
++extern int Internal_flags[MAX_INTERNAL_FLAGS];
+
+ extern int Domain_size; /* owned by mace.c */
+ extern int Init_wall_seconds; /* owned by mace.c */
More information about the svn-ports-all
mailing list