From: | Craig Dooley <craig@xxxxxxxxxx> |
Date: | Tue, 30 Mar 2004 09:35:15 -0500 |
Heres a patch against libtool 1.5.2 to properly recongize us as dragonfly. It makes it have the same behavior as freebsd-elf since I figured the a.out target is probably pretty close to dead. If this looks good, I will make override ports for all the versions of libtool. -Craig -- ------------------------------------------------------------------------ Craig Dooley craig@xxxxxxxxxx ------------------------------------------------------------------------
--- libtool-1.5.2/ltmain.sh Sun Jan 25 07:40:26 2004 +++ libtool-1.5.2-modified/ltmain.sh Fri Mar 26 10:25:36 2004 @@ -1335,7 +1335,7 @@ # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1346,7 +1346,7 @@ esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -2904,7 +2904,7 @@ age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|dragonfly|sunos) current="$number_major" revision="$number_minor" age="0" @@ -2984,6 +2984,11 @@ versuffix=".$current"; ;; + dragonfly) + major=".$current" + versuffix=".$current"; + ;; + irix | nonstopux) major=`expr $current - $age + 1` @@ -3175,7 +3180,7 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; --- libtool-1.5.2/libltdl/ltmain.sh Sun Jan 25 07:40:26 2004 +++ libtool-1.5.2-modified/libltdl/ltmain.sh Fri Mar 26 10:25:35 2004 @@ -1335,7 +1335,7 @@ # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1346,7 +1346,7 @@ esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -2904,7 +2904,7 @@ age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + dragonfly|freebsd-aout|freebsd-elf|sunos) current="$number_major" revision="$number_minor" age="0" @@ -2980,6 +2980,11 @@ ;; freebsd-elf) + major=".$current" + versuffix=".$current"; + ;; + + dragonfly) major=".$current" versuffix=".$current"; ;; --- libtool-1.5.2/ltmain.in Sun Jan 25 01:50:41 2004 +++ libtool-1.5.2-modified/ltmain.in Fri Mar 26 10:25:36 2004 @@ -1335,7 +1335,7 @@ # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1346,7 +1346,7 @@ esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -2904,7 +2904,7 @@ age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|dragonfly|sunos) current="$number_major" revision="$number_minor" age="0" @@ -2984,6 +2984,11 @@ versuffix=".$current"; ;; + dragonfly) + major=".$current" + versuffix=".$current"; + ;; + irix | nonstopux) major=`expr $current - $age + 1` @@ -3175,7 +3180,7 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; --- libtool-1.5.2/libtool.m4 Fri Jan 23 01:07:04 2004 +++ libtool-1.5.2-modified/libtool.m4 Fri Mar 26 10:25:36 2004 @@ -1298,6 +1298,16 @@ dynamic_linker='GNU ld.so' ;; +dragonfly*) + version_type=dragonfly + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat
Attachment:
pgp00019.pgp
Description: PGP signature