upgrade to pth 1.4.1

This commit is contained in:
brad 2002-01-27 17:51:20 +00:00
parent 609de2cb9e
commit 0560e1da01
5 changed files with 12 additions and 143 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2001/12/21 00:36:37 brad Exp $
# $OpenBSD: Makefile,v 1.8 2002/01/27 17:51:20 brad Exp $
COMMENT= "GNU portable threads"
DISTNAME= pth-1.4.0
PKGNAME= ${DISTNAME}p1
DISTNAME= pth-1.4.1
CATEGORIES= devel
NEED_VERSION= 1.500
MASTER_SITES= ${MASTER_SITE_GNU}
@ -26,6 +25,10 @@ CONFIGURE_ARGS+= --enable-static --enable-pthread \
--includedir="${PREFIX}/include/pth" \
--libdir="${PREFIX}/lib/pth"
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
patch-*
REGRESS_TARGET= test
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (pth-1.4.0.tar.gz) = 146314a4c90067f20bc807e0e261fc31
RMD160 (pth-1.4.0.tar.gz) = 2db9ab2a0746d8184111c1cdfd90017f2d5357b0
SHA1 (pth-1.4.0.tar.gz) = bc1adf3fd9a8fa2845f9e89e94255250b479c2d0
MD5 (pth-1.4.1.tar.gz) = d17cb02b5580baeac50d1005ff46ddbc
RMD160 (pth-1.4.1.tar.gz) = ffad45b29203be656bd240a69f32a37a858ee8fd
SHA1 (pth-1.4.1.tar.gz) = bc5b0847d57d2b78945a6c8d4ebab57e46213972

View File

@ -1,51 +0,0 @@
--- ltconfig.orig Sat May 27 07:15:00 2000
+++ ltconfig Fri Jan 19 12:57:33 2001
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2021,13 +2035,10 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

View File

@ -1,83 +0,0 @@
--- ltmain.sh.orig Sat Jul 29 10:51:11 2000
+++ ltmain.sh Tue Feb 20 14:08:16 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1799,6 +1814,9 @@ compiler."
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/03/26 23:54:43 brad Exp $
lib/pth/libpth.so.14.20
lib/pth/libpthread.so.14.20
@comment $OpenBSD: PFRAG.shared,v 1.4 2002/01/27 17:51:21 brad Exp $
lib/pth/libpth.so.14.21
lib/pth/libpthread.so.14.21
NEWDYNLIBDIR(%B)