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

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