API tools faq
paste
delphij

OpenLDAP - drop FreeBSD 1.x support

delphij
Sep 28th, 2011
255
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 11.48 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/aclocal.m4 b/aclocal.m4
  2. index d5ecbec..b6b4e9e 100644
  3. --- a/aclocal.m4
  4. +++ b/aclocal.m4
  5. @@ -1832,10 +1832,6 @@ dgux*)
  6.    shlibpath_var=LD_LIBRARY_PATH
  7.    ;;
  8.  
  9. -freebsd1*)
  10. -  dynamic_linker=no
  11. -  ;;
  12. -
  13.  kfreebsd*-gnu)
  14.    version_type=linux
  15.    need_lib_prefix=no
  16. @@ -1855,7 +1851,6 @@ freebsd* | dragonfly*)
  17.      objformat=`/usr/bin/objformat`
  18.    else
  19.      case $host_os in
  20. -    freebsd[[123]]*) objformat=aout ;;
  21.      *) objformat=elf ;;
  22.      esac
  23.    fi
  24. @@ -3514,10 +3509,6 @@ case $host_os in
  25.     ;;
  26.      esac
  27.      ;;
  28. -  freebsd[[12]]*)
  29. -    # C++ shared libraries reported to be fairly broken before switch to ELF
  30. -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
  31. -    ;;
  32.    freebsd-elf*)
  33.      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  34.      ;;
  35. @@ -6137,29 +6128,6 @@ EOF
  36.        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
  37.        ;;
  38.  
  39. -    freebsd1*)
  40. -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
  41. -      ;;
  42. -
  43. -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
  44. -    # support.  Future versions do this automatically, but an explicit c++rt0.o
  45. -    # does not break anything, and helps significantly (at the cost of a little
  46. -    # extra space).
  47. -    freebsd2.2*)
  48. -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
  49. -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  50. -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  51. -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
  52. -      ;;
  53. -
  54. -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  55. -    freebsd2*)
  56. -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  57. -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  58. -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
  59. -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
  60. -      ;;
  61. -
  62.      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  63.      freebsd* | kfreebsd*-gnu | dragonfly*)
  64.        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  65. diff --git a/configure b/configure
  66. index 2a0ee46..9a6496d 100755
  67. --- a/configure
  68. +++ b/configure
  69. @@ -9454,29 +9454,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  70.        hardcode_shlibpath_var=no
  71.        ;;
  72.  
  73. -    freebsd1*)
  74. -      ld_shlibs=no
  75. -      ;;
  76. -
  77. -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
  78. -    # support.  Future versions do this automatically, but an explicit c++rt0.o
  79. -    # does not break anything, and helps significantly (at the cost of a little
  80. -    # extra space).
  81. -    freebsd2.2*)
  82. -      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
  83. -      hardcode_libdir_flag_spec='-R$libdir'
  84. -      hardcode_direct=yes
  85. -      hardcode_shlibpath_var=no
  86. -      ;;
  87. -
  88. -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  89. -    freebsd2*)
  90. -      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  91. -      hardcode_direct=yes
  92. -      hardcode_minus_L=yes
  93. -      hardcode_shlibpath_var=no
  94. -      ;;
  95. -
  96.      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  97.      freebsd* | kfreebsd*-gnu | dragonfly*)
  98.        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  99. @@ -10054,10 +10031,6 @@ dgux*)
  100.    shlibpath_var=LD_LIBRARY_PATH
  101.    ;;
  102.  
  103. -freebsd1*)
  104. -  dynamic_linker=no
  105. -  ;;
  106. -
  107.  kfreebsd*-gnu)
  108.    version_type=linux
  109.    need_lib_prefix=no
  110. @@ -10077,7 +10050,6 @@ freebsd* | dragonfly*)
  111.      objformat=`/usr/bin/objformat`
  112.    else
  113.      case $host_os in
  114. -    freebsd[123]*) objformat=aout ;;
  115.      *) objformat=elf ;;
  116.      esac
  117.    fi
  118. diff --git a/contrib/ldapc++/aclocal.m4 b/contrib/ldapc++/aclocal.m4
  119. index 1d4ddbf..c17995c 100644
  120. --- a/contrib/ldapc++/aclocal.m4
  121. +++ b/contrib/ldapc++/aclocal.m4
  122. @@ -1535,10 +1535,6 @@ dgux*)
  123.    shlibpath_var=LD_LIBRARY_PATH
  124.    ;;
  125.  
  126. -freebsd1*)
  127. -  dynamic_linker=no
  128. -  ;;
  129. -
  130.  freebsd* | dragonfly*)
  131.    # DragonFly does not have aout.  When/if they implement a new
  132.    # versioning mechanism, adjust this.
  133. @@ -1546,7 +1542,6 @@ freebsd* | dragonfly*)
  134.      objformat=`/usr/bin/objformat`
  135.    else
  136.      case $host_os in
  137. -    freebsd[[123]]*) objformat=aout ;;
  138.      *) objformat=elf ;;
  139.      esac
  140.    fi
  141. @@ -3234,10 +3229,6 @@ case $host_os in
  142.     ;;
  143.      esac
  144.      ;;
  145. -  freebsd[[12]]*)
  146. -    # C++ shared libraries reported to be fairly broken before switch to ELF
  147. -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
  148. -    ;;
  149.    freebsd-elf*)
  150.      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  151.      ;;
  152. @@ -6114,29 +6105,6 @@ _LT_EOF
  153.        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
  154.        ;;
  155.  
  156. -    freebsd1*)
  157. -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
  158. -      ;;
  159. -
  160. -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
  161. -    # support.  Future versions do this automatically, but an explicit c++rt0.o
  162. -    # does not break anything, and helps significantly (at the cost of a little
  163. -    # extra space).
  164. -    freebsd2.2*)
  165. -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
  166. -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  167. -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  168. -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
  169. -      ;;
  170. -
  171. -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  172. -    freebsd2*)
  173. -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  174. -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  175. -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
  176. -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
  177. -      ;;
  178. -
  179.      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  180.      freebsd* | dragonfly*)
  181.        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  182. diff --git a/contrib/ldapc++/configure b/contrib/ldapc++/configure
  183. index c9542e6..a9a0e35 100755
  184. --- a/contrib/ldapc++/configure
  185. +++ b/contrib/ldapc++/configure
  186. @@ -8174,29 +8174,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  187.        hardcode_shlibpath_var=no
  188.        ;;
  189.  
  190. -    freebsd1*)
  191. -      ld_shlibs=no
  192. -      ;;
  193. -
  194. -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
  195. -    # support.  Future versions do this automatically, but an explicit c++rt0.o
  196. -    # does not break anything, and helps significantly (at the cost of a little
  197. -    # extra space).
  198. -    freebsd2.2*)
  199. -      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
  200. -      hardcode_libdir_flag_spec='-R$libdir'
  201. -      hardcode_direct=yes
  202. -      hardcode_shlibpath_var=no
  203. -      ;;
  204. -
  205. -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  206. -    freebsd2*)
  207. -      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  208. -      hardcode_direct=yes
  209. -      hardcode_minus_L=yes
  210. -      hardcode_shlibpath_var=no
  211. -      ;;
  212. -
  213.      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  214.      freebsd* | dragonfly*)
  215.        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  216. @@ -8823,10 +8800,6 @@ dgux*)
  217.    shlibpath_var=LD_LIBRARY_PATH
  218.    ;;
  219.  
  220. -freebsd1*)
  221. -  dynamic_linker=no
  222. -  ;;
  223. -
  224.  freebsd* | dragonfly*)
  225.    # DragonFly does not have aout.  When/if they implement a new
  226.    # versioning mechanism, adjust this.
  227. @@ -8834,7 +8807,6 @@ freebsd* | dragonfly*)
  228.      objformat=`/usr/bin/objformat`
  229.    else
  230.      case $host_os in
  231. -    freebsd[123]*) objformat=aout ;;
  232.      *) objformat=elf ;;
  233.      esac
  234.    fi
  235. @@ -10917,10 +10889,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  236.     ;;
  237.      esac
  238.      ;;
  239. -  freebsd[12]*)
  240. -    # C++ shared libraries reported to be fairly broken before switch to ELF
  241. -    ld_shlibs_CXX=no
  242. -    ;;
  243.    freebsd-elf*)
  244.      archive_cmds_need_lc_CXX=no
  245.      ;;
  246. @@ -12456,10 +12424,6 @@ dgux*)
  247.    shlibpath_var=LD_LIBRARY_PATH
  248.    ;;
  249.  
  250. -freebsd1*)
  251. -  dynamic_linker=no
  252. -  ;;
  253. -
  254.  freebsd* | dragonfly*)
  255.    # DragonFly does not have aout.  When/if they implement a new
  256.    # versioning mechanism, adjust this.
  257. @@ -12467,7 +12431,6 @@ freebsd* | dragonfly*)
  258.      objformat=`/usr/bin/objformat`
  259.    else
  260.      case $host_os in
  261. -    freebsd[123]*) objformat=aout ;;
  262.      *) objformat=elf ;;
  263.      esac
  264.    fi
  265. @@ -14447,29 +14410,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  266.        hardcode_shlibpath_var_F77=no
  267.        ;;
  268.  
  269. -    freebsd1*)
  270. -      ld_shlibs_F77=no
  271. -      ;;
  272. -
  273. -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
  274. -    # support.  Future versions do this automatically, but an explicit c++rt0.o
  275. -    # does not break anything, and helps significantly (at the cost of a little
  276. -    # extra space).
  277. -    freebsd2.2*)
  278. -      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
  279. -      hardcode_libdir_flag_spec_F77='-R$libdir'
  280. -      hardcode_direct_F77=yes
  281. -      hardcode_shlibpath_var_F77=no
  282. -      ;;
  283. -
  284. -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  285. -    freebsd2*)
  286. -      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  287. -      hardcode_direct_F77=yes
  288. -      hardcode_minus_L_F77=yes
  289. -      hardcode_shlibpath_var_F77=no
  290. -      ;;
  291. -
  292.      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  293.      freebsd* | dragonfly*)
  294.        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  295. @@ -15044,10 +14984,6 @@ dgux*)
  296.    shlibpath_var=LD_LIBRARY_PATH
  297.    ;;
  298.  
  299. -freebsd1*)
  300. -  dynamic_linker=no
  301. -  ;;
  302. -
  303.  freebsd* | dragonfly*)
  304.    # DragonFly does not have aout.  When/if they implement a new
  305.    # versioning mechanism, adjust this.
  306. @@ -15055,7 +14991,6 @@ freebsd* | dragonfly*)
  307.      objformat=`/usr/bin/objformat`
  308.    else
  309.      case $host_os in
  310. -    freebsd[123]*) objformat=aout ;;
  311.      *) objformat=elf ;;
  312.      esac
  313.    fi
  314. @@ -17027,29 +16962,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  315.        hardcode_shlibpath_var_GCJ=no
  316.        ;;
  317.  
  318. -    freebsd1*)
  319. -      ld_shlibs_GCJ=no
  320. -      ;;
  321. -
  322. -    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
  323. -    # support.  Future versions do this automatically, but an explicit c++rt0.o
  324. -    # does not break anything, and helps significantly (at the cost of a little
  325. -    # extra space).
  326. -    freebsd2.2*)
  327. -      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
  328. -      hardcode_libdir_flag_spec_GCJ='-R$libdir'
  329. -      hardcode_direct_GCJ=yes
  330. -      hardcode_shlibpath_var_GCJ=no
  331. -      ;;
  332. -
  333. -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  334. -    freebsd2*)
  335. -      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  336. -      hardcode_direct_GCJ=yes
  337. -      hardcode_minus_L_GCJ=yes
  338. -      hardcode_shlibpath_var_GCJ=no
  339. -      ;;
  340. -
  341.      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  342.      freebsd* | dragonfly*)
  343.        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  344. @@ -17624,10 +17536,6 @@ dgux*)
  345.    shlibpath_var=LD_LIBRARY_PATH
  346.    ;;
  347.  
  348. -freebsd1*)
  349. -  dynamic_linker=no
  350. -  ;;
  351. -
  352.  freebsd* | dragonfly*)
  353.    # DragonFly does not have aout.  When/if they implement a new
  354.    # versioning mechanism, adjust this.
  355. @@ -17635,7 +17543,6 @@ freebsd* | dragonfly*)
  356.      objformat=`/usr/bin/objformat`
  357.    else
  358.      case $host_os in
  359. -    freebsd[123]*) objformat=aout ;;
  360.      *) objformat=elf ;;
  361.      esac
  362.    fi
  363.  
  364.  
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!