Changeset 3971

Show
Ignore:
Timestamp:
04/05/05 20:00:39
Author:
donburns
Message:

Updates for HP-UX build system on acc (not gcc).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenThreads/trunk/Make/distrules

    r3813 r3971  
    11distribution :  
    2         @$(MAKEDIST) OpenThreads 
    3  
    4          
     2        @sh $(MAKEDIST) OpenThreads Make/rpm.header Make/rpm.files 
    53 
    64cleandist: 

  • OpenThreads/trunk/Make/instrules

    r2043 r3971  
    2323__inst_headers: 
    2424        @[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p $(INST_INCLUDE)/OpenThreads 
    25         @for f in `find include/OpenThreads -type f -print`; do\ 
     25        for f in include/OpenThreads/* ; do\ 
    2626                [ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-"  ] && \ 
    2727                        echo $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \ 

  • OpenThreads/trunk/Make/makedefs

    r3774 r3971  
    380380 
    381381#### HP-UX Specific definitions 
    382 # contributed by tino.schwarze@informatik.tu-chemnitz.de 
    383382 
    384383ifeq ($(OS),HP-UX) 
    385   ifeq (x$(CXX),x) 
    386     CXX               = g++ 
    387   endif 
    388   DEPARG            = -M 
    389   INC               += -I/opt/glut/include 
    390   DEF               += -W -Wall -fPIC 
    391   OPTF              = -O2  
    392   # gcc 3.1 uses DWARF as default, my GDB might not yet support this... 
    393   # at least I've got problems everywhere 
    394   DBGF              = -g -gstabs+  
    395   SHARED            = -shared -fPIC 
    396   ARCH              = 32 
    397 ifeq ($(ARCH),64) 
    398     # not yet tested 
    399     ARCHARGS          = -march=2.0 
    400 else 
    401    # at least my gcc 3.1 defaults to HP-PA RISC 1.1 
    402   ARCHARGS          =  
    403 endif 
     384  CXX               = aCC -AA -mt 
     385  DEPARG            = -w +make -E 
     386  INC               +=  
     387  DEF               += +Z -z  
     388  OPTF              = +O2  
     389  DBGF              = -g  
     390  SHARED            = +Z -b -z -Wl,+s 
     391  ARCH              = 32 
     392  LDFLAGS           =  
    404393  LINKARGS          = -lpthread 
    405394  LIB_EXT           = sl 
    406395  PLUGIN_EXT        = sl 
    407396  DYNAMICLIBRARYLIB = -ldld 
    408   # glut delivered with HP-UX is outdated 
    409   # make sure that global constructors/destructors are called upon 
    410   # shl_load() / shl_unload() - this is a gcc specific workaround 
    411   OTHER_LIBS        = -lm -Wl,+init -Wl,_GLOBAL__DI -Wl,+fini -Wl,_GLOBAL__DD 
    412 endif 
     397  OTHER_LIBS        = -lm  
     398endif 
     399 
    413400 
    414401VPATH=.. 

  • OpenThreads/trunk/Make/makerpms

    r3813 r3971  
    22 
    33PRODUCT=$1 
    4 INST_LOCATION=$2 
     4RPM_HEADER=$2 
     5RPM_FILES=$3 
    56 
    67SYS_SRC_DIR=/usr/src/packages/ 
    …… 
    1415printRPMHeaderBeforeDescription() 
    1516{ 
    16     cat Make/rpm.header |  awk  \ 
     17    cat $RPM_HEADER |  awk  \ 
    1718        'BEGIN{flag=1}\ 
    1819        { \ 
    …… 
    2627printRPMHeaderAfterDescription() 
    2728{ 
    28     cat Make/rpm.header |  awk  \ 
     29    cat $RPM_HEADER |  awk  \ 
    2930        'BEGIN{flag=0}\ 
    3031        { \ 
    …… 
    7071LEOF 
    7172 
    72     cat Make/rpm.files | while read perm src dst 
     73    cat $RPM_FILES | while read perm src dst 
    7374    do 
    7475        echo "%attr($perm, root, root) $dst" 
    …… 
    8788    [ -d $IDIR ] && rm -rf $IDIR 
    8889 
    89     cat Make/rpm.files | while read perm src dst 
     90    cat $RPM_FILES | while read perm src dst 
    9091    do 
    9192        makedir $IDIR/`dirname $dst` 
    …… 
    9596    tar cf - $IDIR | gzip > $TARBALL_DEST 
    9697} 
     98 
     99check_args() 
     100{ 
     101    if [ ! -f $RPM_HEADER ]  
     102    then 
     103        echo RPM Header file == $RPM_HEADER == missing 
     104        return 1 
     105    fi 
     106    if [ ! -f $RPM_FILES ]  
     107    then 
     108        echo RPM Files file == $RPM_FILES == missing 
     109        return 1 
     110    fi 
     111 
     112    return 0 
     113} 
     114 
     115if ! check_args  
     116then  
     117    exit 1;  
     118fi 
    97119 
    98120makeTarball  

  • OpenThreads/trunk/Make/makerules

    r3949 r3971  
    6464else 
    6565 
    66   ifeq ($(OS),HP-UX) 
    67     # we need to explicitly tell the linker the library name - else it will 
    68     # include paths like ../../../libosg.sl into executables 
    69     $(LIB) : $(OBJS) 
    70                 $(CXX) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -Wl,+h -Wl,$@ -o $@ 
    71             touch $@ 
    72  
    73   else 
    74  
    7566    $(LIB) : $(OBJS) 
    7667                $(CXX) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -o $@.$(LIB_EXT) 
    …… 
    7970            ar rv $@ $? 
    8071 
    81   endif # not HP-UX 
    8272endif # not Darwin 
    8373 

  • OpenThreads/trunk/Make/rpm.header

    r3813 r3971  
    11Summary: A light weight, cross-platform threading library 
    22Copyright: LGPL 
    3 Group: Graphics 
     3Group: Real-Time 
    44Description: 
    55This library is intended to provide a minimal & complete Object-Oriented (OO) thread interface for C++ programmers.  It is loosely modeled on the Java thread API, and the POSIX Threads standards.