shared.patch 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134
  1. --- djbfft-0.76/Makefile.orig 1999-09-30 22:25:58.000000000 +0200
  2. +++ djbfft-0.76/Makefile 2004-01-17 17:21:37.236669242 +0100
  3. @@ -2,6 +2,9 @@
  4. SHELL=/bin/sh
  5. +LIBPERMS=0644
  6. +LIBDJBFFT=djbfft.a
  7. +
  8. default: it
  9. 4c0.c: \
  10. @@ -569,8 +572,8 @@
  11. ./compile 8v5.c
  12. accuracy: \
  13. -load accuracy.o djbfft.a math.lib
  14. - ./load accuracy djbfft.a `cat math.lib`
  15. +load accuracy.o $(LIBDJBFFT) math.lib
  16. + ./load accuracy $(LIBDJBFFT) `cat math.lib`
  17. accuracy.o: \
  18. compile accuracy.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
  19. @@ -578,8 +581,8 @@
  20. ./compile accuracy.c
  21. accuracy2: \
  22. -load accuracy2.o djbfft.a math.lib
  23. - ./load accuracy2 djbfft.a `cat math.lib`
  24. +load accuracy2.o $(LIBDJBFFT) math.lib
  25. + ./load accuracy2 $(LIBDJBFFT) `cat math.lib`
  26. accuracy2.o: \
  27. compile accuracy2.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
  28. @@ -649,7 +652,7 @@
  29. ) > compilebase
  30. chmod 755 compilebase
  31. -djbfft.a: \
  32. +$(LIBDJBFFT): \
  33. makelib 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o 8u0.o 8mc.o 8c0.o 8c1.o \
  34. 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o 8d2.o 8d3.o 8d4.o 8d5.o 8v5.o \
  35. 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o 8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o \
  36. @@ -657,7 +660,7 @@
  37. 4c1.o 4c2.o 4c3.o 4c4.o 4c5.o 4d0.o 4d1.o 4d2.o 4d3.o 4d4.o 4d5.o \
  38. 4v5.o 4v4.o 4v3.o 4v2.o 4v1.o 4v0.o 4mr.o 4r0.o 4r1.o 4r2.o 4r3.o \
  39. 4r4.o 4r5.o 4sr.o fftfreq.o
  40. - ./makelib djbfft.a 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
  41. + ./makelib $(LIBDJBFFT) 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
  42. 8u0.o 8mc.o 8c0.o 8c1.o 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o \
  43. 8d2.o 8d3.o 8d4.o 8d5.o 8v5.o 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o \
  44. 8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o 8r5.o 8sr.o 4sc.o 4u5.o \
  45. @@ -692,7 +695,7 @@
  46. hier.o: \
  47. compile hier.c auto_home.h
  48. - ./compile hier.c
  49. + ./compile -DLIBDJBFFT=\"$(LIBDJBFFT)\" -DLIBPERMS=$(LIBPERMS) hier.c
  50. install: \
  51. load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
  52. @@ -731,7 +734,9 @@
  53. ( cat warn-auto.sh; \
  54. echo 'main="$$1"; shift'; \
  55. echo 'rm -f "$$main"'; \
  56. - echo 'ar cr "$$main" $${1+"$$@"}'; \
  57. + echo 'if [ "$${main##*.}" = "a" ]'; \
  58. + echo 'then'; \
  59. + echo ' ar cr "$$main" $${1+"$$@"}'; \
  60. case "`cat systype`" in \
  61. sunos-5.*) ;; \
  62. unix_sv*) ;; \
  63. @@ -740,8 +745,11 @@
  64. dgux-*) ;; \
  65. hp-ux-*) ;; \
  66. sco*) ;; \
  67. - *) echo 'ranlib "$$main"' ;; \
  68. - esac \
  69. + *) echo ' ranlib "$$main"' ;; \
  70. + esac; \
  71. + echo 'else'; \
  72. + echo ' exec `head -1 conf-ld` -shared -o "$$main" $${1+"$$@"}'; \
  73. + echo 'fi'; \
  74. ) > makelib
  75. chmod 755 makelib
  76. @@ -758,15 +766,15 @@
  77. ./compile open_trunc.c
  78. prog: \
  79. -djbfft.a accuracy accuracy2 speed speed.out
  80. +$(LIBDJBFFT) accuracy accuracy2 speed speed.out
  81. setup: \
  82. it install
  83. ./install
  84. speed: \
  85. -load speed.o djbfft.a math.lib
  86. - ./load speed djbfft.a `cat math.lib`
  87. +load speed.o $(LIBDJBFFT) math.lib
  88. + ./load speed $(LIBDJBFFT) `cat math.lib`
  89. speed.o: \
  90. compile speed.c fftr4.h real4.h fftr8.h real8.h fftc4.h complex4.h \
  91. @@ -775,7 +783,7 @@
  92. speed.out: \
  93. speed
  94. - ./speed > speed.out
  95. + LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" ./speed > speed.out
  96. str.a: \
  97. makelib byte_copy.o byte_cr.o str_len.o
  98. --- djbfft-0.76/hier.c.orig 1999-09-30 22:25:58.000000000 +0200
  99. +++ djbfft-0.76/hier.c 2004-01-17 16:39:21.312774411 +0100
  100. @@ -2,12 +2,12 @@
  101. void hier()
  102. {
  103. - h(auto_home,-1,-1,02755);
  104. + h(auto_home,-1,-1,0755);
  105. - d(auto_home,"lib",-1,-1,02755);
  106. - c(auto_home,"lib","djbfft.a",-1,-1,0644);
  107. + d(auto_home,"lib",-1,-1,0755);
  108. + c(auto_home,"lib",LIBDJBFFT,-1,-1,LIBPERMS);
  109. - d(auto_home,"include",-1,-1,02755);
  110. + d(auto_home,"include",-1,-1,0755);
  111. c(auto_home,"include","real4.h",-1,-1,0644);
  112. c(auto_home,"include","real8.h",-1,-1,0644);
  113. c(auto_home,"include","complex4.h",-1,-1,0644);