ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch

   1 diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in
   2 --- ParMGridGen-1.0_orig/Makefile.in    2001-12-04 16:30:33.000000000 -0800
   3 +++ ParMGridGen-1.0/Makefile.in 2013-08-22 20:07:33.491171127 -0700
   4 @@ -1,6 +1,6 @@
   5  #--------------------------------------------------------------------------
   6  # Which make to use
   7 -make = gmake
   8 +make = make
   9
  10  # Which compiler to use
  11  #  CC is the compiler for the serial code
  12 @@ -12,7 +12,7 @@
  13  OPTFLAGS = -O3
  14
  15  # What options to be used by the compiler
  16 -COPTIONS =
  17 +COPTIONS = -fPIC
  18
  19  # Which loader to use
  20  LD = cc
  21 @@ -33,22 +33,25 @@
  22
  23  # In which directories to look for any additional libraries
  24  LIBDIR = -L../.. \
  25 +         -L../Lib \
  26           -L/usr/lib32/
  27
  28  # Set some flags
  29  DEBUGFLAGS =
  30
  31  # What additional libraries to link the programs with (eg., -lmpi)
  32 -LIBS = -lmgrid -lm
  33 -PARLIBS = -lparmgrid -lmgrid -lmpi -lm
  34 +LIBEXT = so
  35 +
  36 +LIBS = -Xlinker --add-needed -Xlinker --no-as-needed -lMGridGen -lm
  37 +PARLIBS = -Xlinker --add-needed -Xlinker --no-as-needed -lparmgrid -lMGridGen -lmpi -lm
  38
  39
  40  # What archiving to use
  41 -AR = ar rv
  42 +AR = gcc -shared -o
  43
  44  # What to use for indexing the archive
  45  #RANLIB = ranlib
  46 -RANLIB = ar -ts
  47 +RANLIB = true
  48
  49  #--------------------------------------------------------------------------
  50  #
  51 diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/IMlib/Makefile
  52 --- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile        2001-12-04 14:46:56.000000000 -0800
  53 +++ ParMGridGen-1.0/MGridGen/IMlib/Makefile     2013-08-22 20:03:32.925673296 -0700
  54 @@ -33,7 +33,7 @@
  55  .c.o:
  56         $(CC) $(CFLAGS) -c $*.c
  57
  58 -./libIMlib.a: $(OBJS)
  59 +libIMlib.$(LIBEXT): $(OBJS)
  60         $(AR) $@ $(OBJS)
  61         $(RANLIB) $@
  62
  63 @@ -41,4 +41,4 @@
  64         rm -f *.o
  65
  66  realclean:
  67 -       rm -f *.o ; rm -f ./libIMlib.a
  68 +       rm -f *.o ; rm -f ./libIMlib.$(LIBEXT)
  69 diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Lib/Makefile
  70 --- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile  2001-12-04 15:01:00.000000000 -0800
  71 +++ ParMGridGen-1.0/MGridGen/Lib/Makefile       2013-08-22 20:03:32.925673296 -0700
  72 @@ -22,7 +22,7 @@
  73  INCLUDES = -I./ -I$(IMLIBDIR) $(INCDIR)
  74  CFLAGS = $(COPTIONS) $(OPTFLAGS) $(DEBUGFLAGS) $(INCLUDES)
  75
  76 -OBJS = coarsen.o kwayfm.o match.o merge.o mgridgen.o refine.o setup.o
  77 +OBJS = aratio.o coarsen.o kwayfm.o match.o merge.o mgridgen.o refine.o setup.o
  78  IOBJS = blas.o dfkeysort.o dkeysort.o file.o ifkeysort.o ifloatsort.o \
  79         iintsort.o ikeysort.o memory.o  sort.o util.o
  80  IMOBJS = $(addprefix ../IMlib/, $(IOBJS))
  81 @@ -31,7 +31,7 @@
  82  .c.o:
  83         $(CC) $(CFLAGS) -c $*.c
  84
  85 -../../libmgrid.a: $(OBJS) $(IMOBJS)
  86 +libMGridGen.$(LIBEXT): $(OBJS) $(IMOBJS)
  87         $(AR) $@  $(OBJS) $(IMOBJS)
  88         $(RANLIB) $@
  89
  90 @@ -39,4 +39,4 @@
  91         rm -f *.o
  92
  93  realclean:
  94 -       rm -f *.o ; rm -f ../../libmgrid.a
  95 +       rm -f *.o ; rm -f ./libMGridGen.$(LIBEXT)
  96 diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridGen/Programs/Makefile
  97 --- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile     2001-12-04 15:02:26.000000000 -0800
  98 +++ ParMGridGen-1.0/MGridGen/Programs/Makefile  2013-08-22 20:03:32.925673296 -0700
  99 @@ -1,6 +1,6 @@
 100  include ../../Makefile.in
 101
 102 -MGRIDLIB  = ../../libmgrid.a
 103 +MGRIDLIB  = ../Lib/libMGridGen.$(LIBEXT)
 104
 105  ifeq ($(ddmalloc),yes)
 106    DEBUGFLAGS := $(DEBUGFLAGS) -DDMALLOC -DDEBUG