remove the need for a separate copy of libtool.
This commit is contained in:
brad
parent
d327b2ac40
commit
6219f93b1a
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2000/11/20 01:12:41 danh Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2000/12/07 17:25:09 brad Exp $
|
||||
|
||||
VERSION= 1.0.28
|
||||
DISTNAME= rrdtool-${VERSION}
|
||||
@ -27,19 +27,19 @@ LIB_DEPENDS+= gd.18::graphics/gd
|
||||
LIB_DEPENDS+= tcl83::lang/tcl/8.3
|
||||
.endif
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
.if ${FLAVOR:L:Mtcl}
|
||||
USE_GMAKE= Yes
|
||||
.endif
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ENV= LDFLAGS='-L${LOCALBASE}/lib' \
|
||||
CPPFLAGS='-I${LOCALBASE}/include'
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="-I${LOCALBASE}/include"
|
||||
|
||||
.if ${FLAVOR:L:Mtcl}
|
||||
CONFIGURE_ARGS+= --with-tcllib='${LOCALBASE}/lib/tcl8.3'
|
||||
CONFIGURE_ENV+= CFLAGS='-I${LOCALBASE}/include/tcl8.3'
|
||||
CONFIGURE_ARGS+= --with-tcllib="${LOCALBASE}/lib/tcl8.3"
|
||||
CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include/tcl8.3"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-tcllib
|
||||
.endif
|
||||
|
||||
48
net/rrdtool/patches/patch-config_ltconfig
Normal file
48
net/rrdtool/patches/patch-config_ltconfig
Normal file
@ -0,0 +1,48 @@
|
||||
--- config/ltconfig.orig Fri Aug 6 00:06:49 1999
|
||||
+++ config/ltconfig Thu Dec 7 09:31:14 2000
|
||||
@@ -1105,6 +1105,9 @@
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1391,10 +1394,18 @@
|
||||
;;
|
||||
|
||||
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
|
||||
+ openbsd2.[01234567])
|
||||
+ 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'
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -1955,13 +1966,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*)
|
||||
53
net/rrdtool/patches/patch-config_ltmain.sh
Normal file
53
net/rrdtool/patches/patch-config_ltmain.sh
Normal file
@ -0,0 +1,53 @@
|
||||
--- config/ltmain.sh.orig Fri Aug 6 00:06:50 1999
|
||||
+++ config/ltmain.sh Thu Dec 7 09:31:16 2000
|
||||
@@ -1789,6 +1789,9 @@
|
||||
*-*-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.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
@@ -3522,40 +3525,6 @@
|
||||
# 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
|
||||
;;
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2000/09/06 19:17:22 danh Exp $
|
||||
$NetBSD: patch-ap,v 1.1 2000/05/07 13:36:49 wulf Exp $
|
||||
--- configure.orig Tue Aug 22 18:25:23 2000
|
||||
+++ configure Tue Aug 22 18:25:29 2000
|
||||
@@ -1708,7 +1708,7 @@ fi
|
||||
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
|
||||
# Redirect the config.log output again, so that the ltconfig log is not
|
||||
# clobbered by the next message.
|
||||
Loading…
Reference in New Issue
Block a user