healpix-c++/healpix_2.12a.patch

   1 diff -Naur Healpix_2.12a/src/cxx/Healpix_cxx/planck.make Healpix_2.12a_patched/src/cxx/Healpix_cxx/planck.make
   2 --- Healpix_2.12a/src/cxx/Healpix_cxx/planck.make       2006-12-04 20:31:45.000000000 +0100
   3 +++ Healpix_2.12a_patched/src/cxx/Healpix_cxx/planck.make       2009-08-17 22:55:59.508994368 +0200
   4 @@ -44,42 +44,42 @@
   5  libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
   6         $(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
   7
   8 -syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
   9 +syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a
  10  syn_alm_cxx: syn_alm_cxx.o
  11         $(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
  12           -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  13
  14 -alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
  15 +alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a  libfftpack.a
  16  alm2map_cxx: alm2map_cxx.o
  17         $(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
  18         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  19
  20 -anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
  21 +anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a  libfftpack.a
  22  anafast_cxx: anafast_cxx.o
  23         $(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
  24         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  25
  26 -map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
  27 +map2tga.o: libhealpix_cxx.a libcxxsupport.a
  28  map2tga: map2tga.o
  29         $(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
  30         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  31
  32 -udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
  33 +udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a
  34  udgrade_cxx: udgrade_cxx.o
  35         $(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
  36         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  37
  38 -hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
  39 +hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a
  40  hotspots_cxx: hotspots_cxx.o
  41         $(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
  42         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  43
  44 -calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
  45 +calc_powspec.o: libhealpix_cxx.a libcxxsupport.a
  46  calc_powspec: calc_powspec.o
  47         $(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
  48         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  49
  50 -median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
  51 +median_filter.o: libhealpix_cxx.a libcxxsupport.a
  52  median_filter: median_filter.o
  53         $(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
  54         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  55 @@ -89,7 +89,7 @@
  56         $(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
  57         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  58
  59 -smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
  60 +smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a  libfftpack.a
  61  smoothing_cxx: smoothing_cxx.o
  62         $(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
  63         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  64 @@ -99,7 +99,7 @@
  65         $(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
  66         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  67
  68 -mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
  69 +mult_alm.o: libhealpix_cxx.a libcxxsupport.a
  70  mult_alm: mult_alm.o
  71         $(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
  72         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
  73 diff -Naur Healpix_2.12a/src/cxx/Makefile Healpix_2.12a_patched/src/cxx/Makefile
  74 --- Healpix_2.12a/src/cxx/Makefile      2006-01-31 11:31:18.000000000 +0100
  75 +++ Healpix_2.12a_patched/src/cxx/Makefile      2009-08-17 22:56:41.483724397 +0200
  76 @@ -4,7 +4,7 @@
  77
  78  ACTIVE_SUBDIRS := Healpix_cxx alice
  79
  80 -SUBDIRS        := $(ACTIVE_SUBDIRS) libcfitsio cxxsupport libfftpack
  81 +SUBDIRS        := $(ACTIVE_SUBDIRS) cxxsupport libfftpack
  82
  83  LEVELS_SRC:=$(shell pwd)
  84  export LEVELS_SRC
  85 @@ -14,7 +14,7 @@
  86
  87  include $(PARAMFILE)
  88
  89 -cxxsupport.all: libcfitsio.all
  90 +cxxsupport.all:
  91  Healpix_cxx.all: cxxsupport.all libfftpack.all
  92  alice.all: Healpix_cxx.all
  93
  94 diff -Naur Healpix_2.12a/src/cxx/alice/planck.make Healpix_2.12a_patched/src/cxx/alice/planck.make
  95 --- Healpix_2.12a/src/cxx/alice/planck.make     2009-01-08 17:19:58.000000000 +0100
  96 +++ Healpix_2.12a_patched/src/cxx/alice/planck.make     2009-08-17 22:53:46.828171615 +0200
  97 @@ -20,28 +20,28 @@
  98  alice2.o: alice_usage.h OrthogonalSkyMap.h
  99  testOrthogonalSkyMap.o: OrthogonalSkyMap.h
 100
 101 -generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
 102 +generateTexture.o: libhealpix_cxx.a libcxxsupport.a
 103  generateTexture: generateTexture.o
 104         $(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
 105         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
 106
 107 -$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
 108 -alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
 109 +$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a
 110 +alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a
 111         $(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
 112         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
 113
 114 -alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
 115 +alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a
 116         $(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
 117         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
 118
 119 -testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
 120 +testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a
 121         $(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
 122         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
 123
 124 -testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
 125 +testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a
 126         $(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
 127         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
 128
 129 -testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
 130 +testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a
 131         $(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
 132         -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
 133 diff -Naur Healpix_2.12a/src/cxx/alice/testMollweideSkyMap.cc Healpix_2.12a_patched/src/cxx/alice/testMollweideSkyMap.cc
 134 --- Healpix_2.12a/src/cxx/alice/testMollweideSkyMap.cc  2007-05-01 19:29:27.000000000 +0200
 135 +++ Healpix_2.12a_patched/src/cxx/alice/testMollweideSkyMap.cc  2009-08-17 22:54:14.428168716 +0200
 136 @@ -1,3 +1,4 @@
 137 +#include <cstdio>
 138  #include <iostream>
 139  #include <assert.h>
 140  #include <math.h>
 141 diff -Naur Healpix_2.12a/src/cxx/alice/testOrthogonalSkyMap.cc Healpix_2.12a_patched/src/cxx/alice/testOrthogonalSkyMap.cc
 142 --- Healpix_2.12a/src/cxx/alice/testOrthogonalSkyMap.cc 2007-05-01 19:29:27.000000000 +0200
 143 +++ Healpix_2.12a_patched/src/cxx/alice/testOrthogonalSkyMap.cc 2009-08-17 22:54:31.492334434 +0200
 144 @@ -1,3 +1,4 @@
 145 +#include <cstdio>
 146  #include <iostream>
 147  #include <assert.h>
 148  #include <math.h>
 149 diff -Naur Healpix_2.12a/src/cxx/config/config.generic_gcc_pic Healpix_2.12a_patched/src/cxx/config/config.generic_gcc_pic
 150 --- Healpix_2.12a/src/cxx/config/config.generic_gcc_pic 1970-01-01 01:00:00.000000000 +0100
 151 +++ Healpix_2.12a_patched/src/cxx/config/config.generic_gcc_pic 2009-08-17 23:16:11.751368511 +0200
 152 @@ -0,0 +1,17 @@
 153 +CC= gcc
 154 +CCFLAGS_NO_C= -W -Wall -I$(INCDIR) -O2 -g0 -fno-strict-aliasing -fomit-frame-pointer -ffast-math
 155 +CCFLAGS= $(CCFLAGS_NO_C) -fPIC -c
 156 +
 157 +CXX= g++
 158 +CXXL= g++
 159 +CXXWARNFLAGS= -W -Wall -Wshadow -Wwrite-strings -Wredundant-decls -Woverloaded-virtual -Wcast-qual -Wcast-align -Wpointer-arith -Wconversion -Wold-style-cast -Wno-unknown-pragmas
 160 +CXXCFLAGS_NO_C= $(CXXWARNFLAGS) -ansi -I$(INCDIR) -O2 -g0 -ffast-math -fomit-frame-pointer
 161 +CXXCFLAGS= $(CXXCFLAGS_NO_C) -fPIC -c
 162 +CXXLFLAGS= -L. -L$(LIBDIR) -ffast-math
 163 +ifeq ($(shell uname),SunOS)
 164 +CXX_EXTRALIBS= -lnsl -lsocket
 165 +endif
 166 +
 167 +ARCREATE= ar crv
 168 +
 169 +include $(LEVELS_SRC)/config/rules.common
 170 diff -Naur Healpix_2.12a/src/cxx/cxxsupport/planck.make Healpix_2.12a_patched/src/cxx/cxxsupport/planck.make
 171 --- Healpix_2.12a/src/cxx/cxxsupport/planck.make        2008-02-19 11:58:45.000000000 +0100
 172 +++ Healpix_2.12a_patched/src/cxx/cxxsupport/planck.make        2009-08-17 22:55:16.301497835 +0200
 173 @@ -20,7 +20,7 @@
 174  SIMPARAMS_H := simparams.h $(CXXUTILS_H)
 175  PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
 176  ARR_H := arr.h $(CXXUTILS_H)
 177 -FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
 178 +FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
 179  VEC3_H := vec3.h
 180  ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
 181  POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)