diff -urN Ice-3.0.0/config/Make.rules.OSF1 Ice-3.0.0.patched.clean/config/Make.rules.OSF1 --- Ice-3.0.0/config/Make.rules.OSF1 2005-08-16 16:54:17 +0200 +++ Ice-3.0.0.patched.clean/config/Make.rules.OSF1 2006-02-07 10:56:35 +0100 @@ -12,16 +12,42 @@ # # -# Default compiler is g++ +# Default compiler is Compaq C++ # -ifeq ($(CXX),) - CXX = g++ +CXX = cxx + +# +# The makefile of icecpp doesn't specify compiler flags on the build line +# therefor define CC to include the required compiler flag. +# +CC = /usr/ucb/cc -D__osf1__ + +ifeq ($(CXX),cxx) + + CXXFLAGS = $(CXXARCHFLAGS) -pthread -std gnu -D_REENTRANT -D__USE_STD_IOSTREAM -D__osf1__ -msg_display_tag -msg_disable codeunreachable,codcauunr,labelnotreach + + ifeq ($(OPTIMIZE),yes) + CXXFLAGS += -O2 -DNDEBUG -tune host + else + CXXFLAGS += -g + endif + + # + # C++ run-time libraries, necessary for linking some shared libraries. + # + CXXLIBS = + + mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -soname $(2) $(3) $(4) -lpthread + + mklib = ar cr $(1) $(2) + endif + ifeq ($(CXX),g++) - CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT + CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT -D__USE_STD_IOSTREAM -D__osf1__ -pthread ifeq ($(STATICLIBS),) CXXFLAGS += -fPIC @@ -38,7 +64,7 @@ # CXXLIBS = - mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lpthread + mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) $(3) $(4) -lpthread mklib = ar cr $(1) $(2) @@ -47,7 +73,7 @@ BASELIBS = -lIceUtil -lpthread LIBS = -lIce $(BASELIBS) -ICEUTIL_OS_LIBS = -ICE_OS_LIBS = -ldl +ICEUTIL_OS_LIBS = -lrt +ICE_OS_LIBS = export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH)