From 0711739cfff5a119cd078e8b844b376b66187ef8 Mon Sep 17 00:00:00 2001 From: danh Date: Thu, 4 Oct 2001 18:10:09 +0000 Subject: [PATCH] bump NEED_VERSION; sync libtool patches --- net/rrdtool/Makefile | 6 +- net/rrdtool/patches/patch-config_ltconfig | 73 ++++++++++++++-------- net/rrdtool/patches/patch-config_ltmain_sh | 58 ++++++++++------- 3 files changed, 88 insertions(+), 49 deletions(-) diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index 1191adef4de..7ed54a0a834 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.15 2001/09/28 06:02:14 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.16 2001/10/04 18:10:09 danh Exp $ COMMENT= "system to store and display time-series data" VERSION= 1.0.33 DISTNAME= rrdtool-${VERSION} CATEGORIES= net -NEED_VERSION= 1.364 +NEED_VERSION= 1.468 MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/ \ ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/ \ http://ftp.sunet.se/pub/network/monitoring/rrdtool/ @@ -25,8 +25,8 @@ FLAVORS= tcl FLAVOR?= CONFIGURE_STYLE= gnu -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config ${WRKSRC}/contrib/php4 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --enable-static +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config ${WRKSRC}/contrib/php4 .if ${FLAVOR:L:Mtcl} LIB_DEPENDS+= tcl83::lang/tcl/8.3 diff --git a/net/rrdtool/patches/patch-config_ltconfig b/net/rrdtool/patches/patch-config_ltconfig index ad336b3a330..fd22895a839 100644 --- a/net/rrdtool/patches/patch-config_ltconfig +++ b/net/rrdtool/patches/patch-config_ltconfig @@ -1,17 +1,34 @@ -$OpenBSD: patch-config_ltconfig,v 1.4 2001/08/10 19:36:31 danh Exp $ +$OpenBSD: patch-config_ltconfig,v 1.5 2001/10/04 18:10:09 danh Exp $ --- config/ltconfig.orig Mon Feb 5 15:21:50 2001 -+++ config/ltconfig Fri Aug 10 15:24:30 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) ++++ config/ltconfig Thu Oct 4 13:30:45 2001 +@@ -501,7 +501,14 @@ fi + + if test -n "$RANLIB"; then + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ case "$host_os" in ++ openbsd*) ++ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ ;; ++ *) ++ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ ;; ++ esac + fi + + # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. +@@ -1105,7 +1112,9 @@ cygwin* | mingw*) with_gnu_ld=no fi ;; +- +openbsd*) + with_gnu_ld=no + ;; - esac -@@ -1391,10 +1394,21 @@ else + ld_shlibs=yes +@@ -1391,10 +1400,24 @@ else ;; openbsd*) @@ -19,23 +36,26 @@ $OpenBSD: patch-config_ltconfig,v 1.4 2001/08/10 19:36:31 danh Exp $ - hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -+ case "$host_os" in ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ 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='$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 test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' ++ ;; ++ esac ++ fi ;; os2*) -@@ -1955,13 +1969,22 @@ netbsd*) +@@ -1955,9 +1978,25 @@ netbsd*) openbsd*) version_type=sunos @@ -44,20 +64,23 @@ $OpenBSD: patch-config_ltconfig,v 1.4 2001/08/10 19:36:31 danh Exp $ - need_version=no + need_lib_prefix=no + need_version=no ++ sys_lib_search_path_spec="/usr/lib" ++ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" + file_magic_cmd=/usr/bin/file + file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ shlibpath_overrides_runpath=no ++ case "$host_os" in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac + else + deplibs_check_method='file_magic OpenBSD.* shared library' + shlibpath_overrides_runpath=yes 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*) diff --git a/net/rrdtool/patches/patch-config_ltmain_sh b/net/rrdtool/patches/patch-config_ltmain_sh index aa6e9696640..e29fcdcf461 100644 --- a/net/rrdtool/patches/patch-config_ltmain_sh +++ b/net/rrdtool/patches/patch-config_ltmain_sh @@ -1,46 +1,62 @@ -$OpenBSD: patch-config_ltmain_sh,v 1.1 2001/03/04 17:06:41 danh Exp $ +$OpenBSD: patch-config_ltmain_sh,v 1.2 2001/10/04 18:10:09 danh Exp $ --- config/ltmain.sh.orig Fri Aug 6 00:06:50 1999 -+++ config/ltmain.sh Thu Feb 22 16:40:28 2001 ++++ config/ltmain.sh Thu Oct 4 13:38:58 2001 @@ -1073,6 +1073,17 @@ 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 -+ ;; ++ *-*-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 -+ ;; ++ 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 -@@ -1085,6 +1096,10 @@ compiler." +@@ -1085,6 +1096,17 @@ compiler." deplibs="$deplibs $arg" ;; -+ -thread) -+ deplibs="$deplibs $arg" -+ ;; ++ -pthread) ++ case $host in ++ *-*-openbsd*) ++ deplibs="$deplibs $arg" ++ ;; ++ *) ++ continue ++ ;; ++ esac ++ ;; + -module) module=yes continue -@@ -1789,6 +1804,9 @@ compiler." +@@ -1789,6 +1811,9 @@ compiler." *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; ++ *-*-openbsd*) ++ # Do not include libc due to us having libc/libc_r. ++ ;; *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\ +@@ -2598,7 +2623,7 @@ static const void *lt_preloaded_setup() + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. +- *-*-freebsd2*|*-*-freebsd3.0*) ++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; +@@ -3522,40 +3547,6 @@ libdir='$install_libdir'\ # Exit here if they wanted silent mode. test "$show" = : && exit 0