Pileus Git - ~andy/sunrise/blob - dev-libs/openthreads/files/openthreads-1.4.3-build.patch

   1 --- OSG_OP_OT-1.1~/OpenThreads/Make/makedefs    2006-07-18 15:25:58.000000000 +0200
   2 +++ OSG_OP_OT-1.1/OpenThreads/Make/makedefs     2006-09-10 14:13:31.000000000 +0200
   3 @@ -68,8 +68,8 @@
   4
   5  INC        = -I$(TOPDIR)/include
   6
   7 -CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
   8 -LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH)
   9 +CXXFLAGS   += -Wall $(ARCHARGS) $(DOF) $(DEF) $(INC)
  10 +LDFLAGS    += $(ARCHARGS) $(DOF) -L$(TOPDIR)/lib/$(OS)$(ARCH) $(LINKARGS)
  11  OBJS       = $(CXXFILES:.cpp=.o) \
  12              $(C++FILES:.c++=.o) \
  13                  $(CFILES:.c=.o) \
  14 @@ -101,7 +101,7 @@
  15  INSTLINKCMD        = $(LINK)
  16
  17  LIB_PREFIX         = lib
  18 -LIB_EXT            = so
  19 +LIB_EXT            = so.$(VERSION)
  20
  21  MAKEDIST           = echo "   === Distribution build is not implemented yet for $(OS)"; printf "\n"
  22  INSTLOGFILE        = /tmp/.openThreads_inst_log
  23 @@ -228,12 +228,12 @@
  24        CXX               = g++
  25      endif
  26
  27 -ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
  28 -    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
  29 -endif
  30 +#ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
  31 +    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT)
  32 +#endif
  33
  34      ###DEF               += -fPIC
  35 -    OPTF              = -O2
  36 +    #OPTF              = -O2
  37      DBGF              = -ggdb -gstabs
  38      ifeq ($(SYSARCH),x86_64)
  39        ARCH              = 64
  40 @@ -252,9 +252,9 @@
  41    SHARED            = -shared
  42    ARCHARGS          =
  43  ifeq ($(SYSARCH),x86_64)
  44 -  LINKARGS          = -L/usr/X11R6/lib64
  45 +  LINKARGS          = -L/usr/lib64
  46  else
  47 -  LINKARGS          = -L/usr/X11R6/lib
  48 +  LINKARGS          = -L/usr/lib
  49  endif
  50    MAKEDIST          = $(TOPDIR)/Make/makerpms
  51  endif