$NetBSD: patch-libltdl_configure,v 1.2 2018/11/13 21:44:42 sevan Exp $ Automatically generated using manual-* patches and bootstrap. DO NOT MODIFY THIS PATCH MANUALLY! YOUR CHANGES WILL BE LOST! --- libltdl/configure.orig 2018-11-13 09:14:36.380678459 +0000 +++ libltdl/configure @@ -4788,7 +4788,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd* | mirbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -4886,6 +4886,9 @@ max_cmd_len=$lt_cv_sys_max_cmd_len +unset CP +unset MV +unset RM : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5254,12 +5257,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu lt_cv_deplibs_check_method=pass_all ;; -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi +midnightbsd*) + # might to use match_pattern like MirBSD, but there is no well-defined + # naming scheme for libraries yet, as the current one is deprecated, and + # the new one in a state of flux especially between mports and MirPorts + lt_cv_deplibs_check_method=pass_all + ;; + +mirbsd*) + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + ;; + +netbsd* | minix*) + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' ;; newos6*) @@ -5269,7 +5279,7 @@ newos6*) ;; *nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$' ;; openbsd* | bitrig*) @@ -5901,7 +5911,7 @@ fi case $host_os in darwin*) - lock_old_archive_extraction=yes ;; + lock_old_archive_extraction=no ;; # work around bug #14579 *) lock_old_archive_extraction=no ;; esac @@ -5990,7 +6000,7 @@ osf*) symcode='[BCDEGQRST]' ;; solaris*) - symcode='[BDRT]' + symcode='[BCDRT]' ;; sco3.2v5*) symcode='[DT]' @@ -6386,7 +6396,10 @@ func_cc_basename () *) break;; esac done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + # Return the actual command name, not our pkgsrc wrapper name because several + # decisions are made only based on compiler names + if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi + func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` } # Check whether --enable-libtool-lock was given. @@ -8635,9 +8648,16 @@ lt_prog_compiler_static= ;; darwin* | rhapsody*) - # PIC is the default on this platform + # PIC is the default on this platform, and static linking of + # binaries generally doesn't work # Common symbols not allowed in MH_DYLIB files lt_prog_compiler_pic='-fno-common' + lt_prog_compiler_static='' + ;; + + *mint*) + # FreeMiNT does not support shared libraries at all + lt_prog_compiler_pic= ;; haiku*) @@ -8665,6 +8685,13 @@ lt_prog_compiler_static= # Instead, we relocate shared libraries at runtime. ;; + mint*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -8842,6 +8869,15 @@ lt_prog_compiler_static= esac ;; + mirbsd*) + case $cc_basename in + # pkgsrc f77 is f2c, which uses gcc underneath. + f77*) + lt_prog_compiler_wl='-Wl,' + ;; + esac + ;; + newsos6) lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -8917,6 +8953,9 @@ lt_prog_compiler_static= case $host_os in # For platforms that do not support PIC, -DPIC is meaningless: + mint*) + lt_prog_compiler_pic= + ;; *djgpp*) lt_prog_compiler_pic= ;; @@ -9495,16 +9534,29 @@ _LT_EOF fi ;; - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= + mirbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ld_shlibs=no fi ;; + netbsd* | minix*) + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + output_verbose_link_cmd=func_echo_all + ;; + solaris*) if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ld_shlibs=no @@ -9964,7 +10016,7 @@ fi allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in ifort*|nagfor*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; + *) _lt_dar_can_shared=yes ;; esac if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all @@ -10186,15 +10238,28 @@ $as_echo "$lt_cv_irix_exported_symbol" > esac ;; - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + mirbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + archive_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + ld_shlibs=no fi - hardcode_libdir_flag_spec='-R$libdir' + ;; + + netbsd* | minix*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_direct=yes hardcode_shlibpath_var=no + output_verbose_link_cmd=func_echo_all ;; newsos6) @@ -10206,6 +10271,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > ;; *nto* | *qnx*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ;; openbsd* | bitrig*) @@ -11050,7 +11120,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -11095,6 +11165,17 @@ freebsd* | dragonfly*) esac ;; +dragonfly*) + version_type=linux + need_version=no + need_lib_prefix=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -11172,12 +11253,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; - *) - if test yes = "$lt_cv_prog_gnu_ld"; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; + *) version_type=irix ;; esac need_lib_prefix=no need_version=no @@ -11301,19 +11377,48 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +midnightbsd*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +minix*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Minix ld.elf_so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +mirbsd*) + version_type=linux + sys_lib_search_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + netbsd*) - version_type=sunos + version_type=linux need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - dynamic_linker='NetBSD ld.elf_so' - fi + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -11339,7 +11444,7 @@ newsos6) ;; openbsd* | bitrig*) - version_type=sunos + version_type=linux sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then @@ -11347,7 +11452,7 @@ openbsd* | bitrig*) else need_version=yes fi - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12923,7 +13028,10 @@ else # at 6.2 and later dlopen does load deplibs. lt_cv_sys_dlopen_deplibs=yes ;; - netbsd*) + mirbsd*) + lt_cv_sys_dlopen_deplibs=yes + ;; + netbsd* | minix*) lt_cv_sys_dlopen_deplibs=yes ;; openbsd*) @@ -15440,7 +15548,10 @@ func_cc_basename () *) break;; esac done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + # Return the actual command name, not our pkgsrc wrapper name because several + # decisions are made only based on compiler names + if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi + func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` }