SHARED_LIBS and USE_LIBTOOL
This commit is contained in:
sturm
parent
ed234ef850
commit
5b0e2b90a3
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.12 2005/01/23 10:30:02 espie Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.13 2005/12/25 20:35:41 sturm Exp $
|
||||
|
||||
COMMENT= "Berkeley DB package, revision ${REVISION}"
|
||||
COMMENT-tcl= "TCL bindings for Berkeley DB, revision ${REVISION}"
|
||||
@ -17,6 +17,8 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
|
||||
CONFIGURE_SCRIPT= ../dist/configure
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
|
||||
--enable-compat185 \
|
||||
@ -55,6 +57,15 @@ LIB_DEPENDS=
|
||||
# this compiles slightly different code, some tests fail nevertheless
|
||||
#CONFIGURE_ARGS+=--enable-test
|
||||
|
||||
MODGNU_SHARED_LIBS=db '' \
|
||||
db_cxx '' \
|
||||
db_tcl ''
|
||||
|
||||
MAKE_FLAGS= DBVERSION=${LIBdb_VERSION} \
|
||||
DBCXXVERSION=${LIBdb_cxx_VERSION} \
|
||||
DBTCLVERSION=${LIBdb_tcl_VERSION}
|
||||
FAKE_FLAGS= ${MAKE_FLAGS}
|
||||
|
||||
do-regress:
|
||||
@cd ${WRKBUILD}; env PATH=${PORTPATH} tclsh${TCL_VERSION} ${FILESDIR}/regress.tcl
|
||||
|
||||
|
||||
@ -1,9 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2005/11/01 15:44:24 bernd Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2005/12/25 20:35:42 sturm Exp $
|
||||
|
||||
REVISION= 3
|
||||
DBLIBDIR= lib/db
|
||||
VERSION= ${REVISION}.1.17
|
||||
PKGNAME= ${DISTNAME}p4
|
||||
PKGNAME= ${DISTNAME}p5
|
||||
SHARED_LIBS= db 3.1 \
|
||||
db_cxx 3.1 \
|
||||
db_tcl 3.1
|
||||
|
||||
CONFIGURE_STYLE=gnu dest
|
||||
|
||||
|
||||
@ -1,7 +1,18 @@
|
||||
$OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
$OpenBSD: patch-dist_Makefile_in,v 1.5 2005/12/25 20:35:42 sturm Exp $
|
||||
--- dist/Makefile.in.orig Tue Jul 18 17:37:57 2000
|
||||
+++ dist/Makefile.in Tue Nov 1 13:02:45 2005
|
||||
@@ -34,11 +34,11 @@ SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSIO
|
||||
+++ dist/Makefile.in Sun Dec 25 20:00:19 2005
|
||||
@@ -26,7 +26,9 @@ LIBTSO_LIBS= @LIBTSO_LIBS@
|
||||
LIBXSO_LIBS= @LIBXSO_LIBS@
|
||||
|
||||
POSTLINK= @POSTLINK@
|
||||
-SOLINK= @SOLINK@
|
||||
+dbLINK= @dbLINK@
|
||||
+dbcxxLINK= @dbcxxLINK@
|
||||
+dbtclLINK= @dbtclLINK@
|
||||
SOFLAGS= @SOFLAGS@
|
||||
SOMAJOR= @DB_VERSION_MAJOR@
|
||||
SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
|
||||
@@ -34,11 +36,11 @@ SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSIO
|
||||
libdb= libdb.a
|
||||
|
||||
libso_base= libdb
|
||||
@ -9,7 +20,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
|
||||
-libso_target= $(libso_base)-$(SOVERSION).la
|
||||
+libso_linkname= $(libso_base).la
|
||||
+libso= $(libso_base).@SOSUFFIX@.$(SOVERSION)
|
||||
+libso= $(libso_base).@SOSUFFIX@.$(DBVERSION)
|
||||
+libso_target= $(libso_base).la
|
||||
libso_default= $(libso_base).@SOSUFFIX@
|
||||
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
|
||||
@ -17,13 +28,13 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# C++
|
||||
@@ -49,10 +49,10 @@ libso_major= $(libso_base)-$(SOMAJOR).@S
|
||||
@@ -49,10 +51,10 @@ libso_major= $(libso_base)-$(SOMAJOR).@S
|
||||
##################################################
|
||||
libcxx= libdb_cxx.a
|
||||
libxso_base= libdb_cxx
|
||||
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
|
||||
-libxso_target= $(libxso_base)-$(SOVERSION).la
|
||||
+libxso= $(libxso_base).@SOSUFFIX@.$(SOVERSION)
|
||||
+libxso= $(libxso_base).@SOSUFFIX@.$(DBCXXVERSION)
|
||||
+libxso_target= $(libxso_base).la
|
||||
libxso_default= $(libxso_base).@SOSUFFIX@
|
||||
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
|
||||
@ -31,7 +42,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# JAVA
|
||||
@@ -71,11 +71,11 @@ JAVA_DBDIR= $(JAVA_SRCDIR)/com/sleepycat
|
||||
@@ -71,11 +73,11 @@ JAVA_DBDIR= $(JAVA_SRCDIR)/com/sleepycat
|
||||
JAVA_EXDIR= $(JAVA_SRCDIR)/com/sleepycat/examples
|
||||
|
||||
libjso_base= libdb_java
|
||||
@ -47,13 +58,13 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# TCL
|
||||
@@ -86,10 +86,10 @@ libjso_g= $(libjso_base)-$(SOVERSION)_g.
|
||||
@@ -86,10 +88,10 @@ libjso_g= $(libjso_base)-$(SOVERSION)_g.
|
||||
##################################################
|
||||
TCFLAGS= @TCFLAGS@
|
||||
libtso_base= libdb_tcl
|
||||
-libtso= $(libtso_base)-$(SOVERSION).@SOSUFFIX@
|
||||
-libtso_target= $(libtso_base)-$(SOVERSION).la
|
||||
+libtso= $(libtso_base).@SOSUFFIX@.$(SOVERSION)
|
||||
+libtso= $(libtso_base).@SOSUFFIX@.$(DBTCLVERSION)
|
||||
+libtso_target= $(libtso_base).la
|
||||
libtso_default= $(libtso_base).@SOSUFFIX@
|
||||
-libtso_major= $(libtso_base)-$(SOMAJOR).@SOSUFFIX@
|
||||
@ -61,7 +72,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# DB_DUMP185 UTILITY
|
||||
@@ -112,7 +112,8 @@ exec_prefix=@exec_prefix@
|
||||
@@ -112,7 +114,8 @@ exec_prefix=@exec_prefix@
|
||||
bindir= @bindir@
|
||||
includedir=@includedir@
|
||||
libdir= @libdir@
|
||||
@ -71,7 +82,30 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
dmode= 755
|
||||
emode= 555
|
||||
@@ -398,7 +399,7 @@ install_include:
|
||||
@@ -233,11 +236,11 @@ $(libcxx): $(COBJS) $(OBJS)
|
||||
test ! -f $(ranlib) || $(ranlib) $@
|
||||
|
||||
$(libso_target): $(OBJS)
|
||||
- $(SOLINK) $(SOFLAGS) -o $(libso_target) \
|
||||
+ $(dbLINK) $(SOFLAGS) -o $(libso_target) \
|
||||
$(OBJS) $(LDFLAGS) $(LIBSO_LIBS)
|
||||
|
||||
$(libxso_target): $(COBJS) $(OBJS)
|
||||
- $(SOLINK) $(SOFLAGS) -o $(libxso_target) \
|
||||
+ $(dbcxxLINK) $(SOFLAGS) -o $(libxso_target) \
|
||||
$(COBJS) $(OBJS) $(LDFLAGS) $(LIBXSO_LIBS)
|
||||
|
||||
$(libjso_target): $(JOBJS) $(OBJS)
|
||||
@@ -245,7 +248,7 @@ $(libjso_target): $(JOBJS) $(OBJS)
|
||||
$(JOBJS) $(OBJS) $(LDFLAGS) $(LIBJSO_LIBS)
|
||||
|
||||
$(libtso_target): $(TOBJS) $(OBJS)
|
||||
- $(SOLINK) $(SOFLAGS) -o $(libtso_target) \
|
||||
+ $(dbtclLINK) $(SOFLAGS) -o $(libtso_target) \
|
||||
$(TOBJS) $(OBJS) $(LDFLAGS) $(LIBTSO_LIBS)
|
||||
|
||||
##################################################
|
||||
@@ -398,7 +401,7 @@ install_include:
|
||||
@test -d $(includedir) || \
|
||||
($(mkdir) -p $(includedir) && $(chmod) $(dmode) $(includedir))
|
||||
@cd $(includedir) && $(rm) -f db.h db_185.h db_cxx.h
|
||||
@ -80,7 +114,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
@cd $(includedir) && $(chmod) $(fmode) db.h db_185.h db_cxx.h
|
||||
|
||||
install_static: install_setup
|
||||
@@ -424,9 +425,9 @@ install_dynamic: install_setup
|
||||
@@ -424,9 +427,9 @@ install_dynamic: install_setup
|
||||
@cd $(libdir) && \
|
||||
$(rm) -f $(libso) $(libso_default) $(libso_major)
|
||||
@$(INSTALLER) $(libso_target) $(libdir)
|
||||
@ -91,7 +125,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
install_dynamic_cxx: install_setup
|
||||
@echo "Installing DB C++ library: $(libdir) ..."
|
||||
@@ -435,6 +436,7 @@ install_dynamic_cxx: install_setup
|
||||
@@ -435,6 +438,7 @@ install_dynamic_cxx: install_setup
|
||||
@cd $(libdir) && \
|
||||
$(rm) -f $(libxso) $(libxso_default) $(libxso_major)
|
||||
@$(INSTALLER) $(libxso_target) $(libdir)
|
||||
@ -99,7 +133,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
|
||||
@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
|
||||
|
||||
@@ -445,6 +447,7 @@ install_tcl: install_setup
|
||||
@@ -445,6 +449,7 @@ install_tcl: install_setup
|
||||
@cd $(libdir) && \
|
||||
$(rm) -f $(libtso) $(libtso_default) $(libtso_major)
|
||||
@$(INSTALLER) $(libtso_target) $(libdir)
|
||||
@ -107,7 +141,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.4 2005/11/01 15:44:24 bernd Exp $
|
||||
@cd $(libdir) && $(ln) -s $(libtso) $(libtso_default)
|
||||
@cd $(libdir) && $(ln) -s $(libtso) $(libtso_major)
|
||||
|
||||
@@ -465,13 +468,14 @@ install_docs: install_setup
|
||||
@@ -465,13 +470,14 @@ install_docs: install_setup
|
||||
($(mkdir) -p $(docdir) && $(chmod) $(dmode) $(docdir))
|
||||
@cd $(docdir) && $(rm) -rf *
|
||||
@cd $(srcdir)/docs && $(cp) -pr * $(docdir)/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-dist_configure,v 1.3 2005/11/01 15:44:24 bernd Exp $
|
||||
$OpenBSD: patch-dist_configure,v 1.4 2005/12/25 20:35:42 sturm Exp $
|
||||
--- dist/configure.orig Mon Jul 31 18:58:18 2000
|
||||
+++ dist/configure Tue Nov 1 12:34:21 2005
|
||||
+++ dist/configure Sun Dec 25 19:59:25 2005
|
||||
@@ -728,7 +728,7 @@ echo "$ac_t""no" 1>&6
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-dist_configure,v 1.3 2005/11/01 15:44:24 bernd Exp $
|
||||
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
||||
|
||||
SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool`
|
||||
@@ -1615,9 +1614,9 @@ echo "configure:1601: checking libtool c
|
||||
@@ -1615,9 +1614,11 @@ echo "configure:1601: checking libtool c
|
||||
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${SAVE_CXX}"
|
||||
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
|
||||
|
||||
@ -26,11 +26,13 @@ $OpenBSD: patch-dist_configure,v 1.3 2005/11/01 15:44:24 bernd Exp $
|
||||
+ INSTALLER="\$(LIBTOOL) --mode=install \${BSD_INSTALL_PROGRAM}"
|
||||
POSTLINK="\$(LIBTOOL) --mode=execute true"
|
||||
- SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
|
||||
+ SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info @DB_VERSION_MAJOR@:@DB_VERSION_MINOR@"
|
||||
+ dbLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} \${libdb_la_LDFLAGS}"
|
||||
+ dbcxxLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} \${libdb_cxx_la_LDFLAGS}"
|
||||
+ dbtclLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} \${libdb_tcl_la_LDFLAGS}"
|
||||
SOFLAGS="-rpath \$(libdir)"
|
||||
o=".lo"
|
||||
fi
|
||||
@@ -1936,7 +1935,7 @@ echo "configure:1911: checking for exist
|
||||
@@ -1936,7 +1937,7 @@ echo "configure:1911: checking for exist
|
||||
TCFLAGS="-I$TCL_PREFIX/include"
|
||||
fi
|
||||
|
||||
@ -39,7 +41,7 @@ $OpenBSD: patch-dist_configure,v 1.3 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
ADDITIONAL_LIBS="$ADDITIONAL_LIBS \$(libtso_target)"
|
||||
DEFAULT_INSTALL="${DEFAULT_INSTALL} install_tcl"
|
||||
@@ -3911,7 +3910,7 @@ else
|
||||
@@ -3911,7 +3912,7 @@ else
|
||||
#line 3912 "configure"
|
||||
#include "confdefs.h"
|
||||
main(){
|
||||
@ -48,3 +50,14 @@ $OpenBSD: patch-dist_configure,v 1.3 2005/11/01 15:44:24 bernd Exp $
|
||||
#if defined(__GNUC__)
|
||||
exit(0);
|
||||
#endif
|
||||
@@ -5359,7 +5360,9 @@ s%@MAKEFILE_CXX@%$MAKEFILE_CXX%g
|
||||
s%@POSTLINK@%$POSTLINK%g
|
||||
s%@RPC_OBJS@%$RPC_OBJS%g
|
||||
s%@SOFLAGS@%$SOFLAGS%g
|
||||
-s%@SOLINK@%$SOLINK%g
|
||||
+s%@dbLINK@%$dbLINK%g
|
||||
+s%@dbcxxLINK@%$dbcxxLINK%g
|
||||
+s%@dbtclLINK@%$dbtclLINK%g
|
||||
s%@SOSUFFIX@%$SOSUFFIX%g
|
||||
s%@o@%$o%g
|
||||
s%@DB_VERSION_MAJOR@%$DB_VERSION_MAJOR%g
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
$OpenBSD: patch-dist_ltconfig,v 1.1.1.1 2003/12/08 17:37:55 sturm Exp $
|
||||
--- dist/ltconfig.orig Tue May 2 19:03:13 2000
|
||||
+++ dist/ltconfig Thu Aug 30 21:10:07 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,6 +1112,9 @@ cygwin* | mingw*)
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1400,10 +1410,21 @@ else
|
||||
;;
|
||||
|
||||
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 test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -2009,9 +2030,23 @@ netbsd*)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
- if test "$with_gnu_ld" = yes; then
|
||||
- need_lib_prefix=no
|
||||
- need_version=no
|
||||
+ need_lib_prefix=no
|
||||
+ need_version=no
|
||||
+ file_magic_cmd=/usr/bin/file
|
||||
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
+ 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'
|
||||
+ 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'
|
||||
@ -1,85 +0,0 @@
|
||||
$OpenBSD: patch-dist_ltmain_sh,v 1.2 2004/09/24 20:47:22 sturm Exp $
|
||||
--- dist/ltmain.sh.orig Sun Jul 30 19:45:53 2000
|
||||
+++ dist/ltmain.sh Thu Sep 16 21:06:13 2004
|
||||
@@ -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
|
||||
@@ -1796,6 +1811,10 @@ compiler."
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
+
|
||||
#### local change for Sleepycat DB: [#2380]
|
||||
# The following case is added, since the linker's -pthread
|
||||
# option implicitly controls use of -lc or -lc_r.
|
||||
@@ -3563,40 +3582,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
|
||||
;;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/24 20:47:22 sturm Exp $
|
||||
@lib lib/db/libdb.so.3.1
|
||||
@lib lib/db/libdb_cxx.so.3.1
|
||||
@lib lib/libdb.so.3.1
|
||||
@lib lib/libdb_cxx.so.3.1
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/25 20:35:42 sturm Exp $
|
||||
@lib lib/db/libdb.so.${LIBdb_VERSION}
|
||||
@lib lib/db/libdb_cxx.so.${LIBdb_cxx_VERSION}
|
||||
@lib lib/libdb.so.${LIBdb_VERSION}
|
||||
@lib lib/libdb_cxx.so.${LIBdb_cxx_VERSION}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2005/09/16 09:51:26 espie Exp $
|
||||
@pkgpath databases/db/v3,no_tcl
|
||||
@comment $OpenBSD: PLIST,v 1.7 2005/12/25 20:35:42 sturm Exp $
|
||||
@option no-default-conflict
|
||||
@conflict db->=3,<4
|
||||
@pkgpath databases/db/v3,no_tcl
|
||||
bin/db_archive
|
||||
bin/db_checkpoint
|
||||
bin/db_deadlock
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
@comment $OpenBSD: PLIST-tcl,v 1.1 2004/09/24 20:47:22 sturm Exp $
|
||||
@comment $OpenBSD: PLIST-tcl,v 1.2 2005/12/25 20:35:42 sturm Exp $
|
||||
@option no-default-conflict
|
||||
@conflict db-tcl->=3,<4
|
||||
lib/db/libdb_tcl.a
|
||||
lib/db/libdb_tcl.la
|
||||
@comment lib/db/libdb_tcl.so
|
||||
@lib lib/db/libdb_tcl.so.${LIBdb_tcl_VERSION}
|
||||
@comment lib/db/libdb_tcl.so.3
|
||||
@lib lib/db/libdb_tcl.so.3.1
|
||||
@lib lib/libdb_tcl.so.3.1
|
||||
@lib lib/libdb_tcl.so.${LIBdb_tcl_VERSION}
|
||||
share/doc/db/api_tcl/
|
||||
share/doc/db/api_tcl/db_close.html
|
||||
share/doc/db/api_tcl/db_count.html
|
||||
|
||||
@ -1,9 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2005/11/03 23:12:45 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2005/12/25 20:35:42 sturm Exp $
|
||||
|
||||
REVISION= 4
|
||||
VERSION= ${REVISION}.2.52
|
||||
PKGNAME= ${DISTNAME}p6
|
||||
PKGNAME= ${DISTNAME}p7
|
||||
DBLIBDIR= lib/db4
|
||||
SHARED_LIBS= db 4.2 \
|
||||
db_cxx 4.2 \
|
||||
db_tcl 4.2
|
||||
|
||||
MASTER_SITES0= ${MASTER_SITES:S/snapshot/${VERSION}/}
|
||||
PATCHFILES= patch.${VERSION}.1:0 \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
$OpenBSD: patch-dist_Makefile_in,v 1.7 2005/12/25 20:35:42 sturm Exp $
|
||||
--- dist/Makefile.in.orig Fri Nov 28 19:50:06 2003
|
||||
+++ dist/Makefile.in Tue Nov 1 15:43:00 2005
|
||||
+++ dist/Makefile.in Sun Dec 25 20:34:17 2005
|
||||
@@ -11,7 +11,8 @@ exec_prefix=@exec_prefix@
|
||||
bindir= @bindir@
|
||||
includedir=@includedir@
|
||||
@ -11,7 +11,17 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
dmode= 755
|
||||
emode= 555
|
||||
@@ -62,11 +63,11 @@ LIBSO_LIBS= @LIBSO_LIBS@
|
||||
@@ -42,7 +43,8 @@ INSTALLER= @INSTALLER@
|
||||
LIBTOOL= @LIBTOOL@
|
||||
|
||||
POSTLINK= @POSTLINK@
|
||||
-SOLINK= @MAKEFILE_SOLINK@
|
||||
+dbLINK= @MAKEFILE_dbLINK@
|
||||
+dbtclLINK= @MAKEFILE_dbtclLINK@
|
||||
SOFLAGS= @SOFLAGS@
|
||||
LIBMAJOR= @DB_VERSION_MAJOR@
|
||||
LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
|
||||
@@ -62,11 +64,11 @@ LIBSO_LIBS= @LIBSO_LIBS@
|
||||
|
||||
libdb_base= libdb
|
||||
libdb= $(libdb_base).a
|
||||
@ -19,7 +29,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
-libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
|
||||
-libso_target= $(libdb_base)-$(LIBVERSION).la
|
||||
+libdb_version= $(libdb_base).a
|
||||
+libso= $(libdb_base)@SOSUFFIX@.$(LIBVERSION)
|
||||
+libso= $(libdb_base)@SOSUFFIX@.$(DBVERSION)
|
||||
+libso_target= $(libdb_base).la
|
||||
libso_default= $(libdb_base)@SOSUFFIX@
|
||||
-libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
|
||||
@ -27,7 +37,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# C++ API.
|
||||
@@ -81,11 +82,11 @@ LIBXSO_LIBS= @LIBXSO_LIBS@
|
||||
@@ -81,11 +83,11 @@ LIBXSO_LIBS= @LIBXSO_LIBS@
|
||||
|
||||
libcxx_base= libdb_cxx
|
||||
libcxx= $(libcxx_base).a
|
||||
@ -35,7 +45,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
-libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
|
||||
-libxso_target= $(libcxx_base)-$(LIBVERSION).la
|
||||
+libcxx_version= $(libcxx_base).a
|
||||
+libxso= $(libcxx_base)@SOSUFFIX@.$(LIBVERSION)
|
||||
+libxso= $(libcxx_base)@SOSUFFIX@.$(DBCXXVERSION)
|
||||
+libxso_target= $(libcxx_base).la
|
||||
libxso_default= $(libcxx_base)@SOSUFFIX@
|
||||
-libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
|
||||
@ -43,14 +53,14 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# Java API.
|
||||
@@ -127,11 +128,11 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
|
||||
@@ -127,11 +129,11 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
|
||||
TCFLAGS= @TCFLAGS@
|
||||
LIBTSO_LIBS= @LIBTSO_LIBS@
|
||||
libtso_base= libdb_tcl
|
||||
-libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
|
||||
-libtso_static= $(libtso_base)-$(LIBVERSION).a
|
||||
-libtso_target= $(libtso_base)-$(LIBVERSION).la
|
||||
+libtso= $(libtso_base)@MODSUFFIX@.$(LIBVERSION)
|
||||
+libtso= $(libtso_base)@MODSUFFIX@.$(DBTCLVERSION)
|
||||
+libtso_static= $(libtso_base).a
|
||||
+libtso_target= $(libtso_base).la
|
||||
libtso_default= $(libtso_base)@MODSUFFIX@
|
||||
@ -59,7 +69,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# db_dump185 UTILITY
|
||||
@@ -583,8 +584,8 @@ RPC_JAVASRV_SRCS=\
|
||||
@@ -583,8 +585,8 @@ RPC_JAVASRV_SRCS=\
|
||||
|
||||
UTIL_PROGS=\
|
||||
@ADDITIONAL_PROGS@ \
|
||||
@ -70,7 +80,25 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
|
||||
##################################################
|
||||
# List of files installed into the library directory.
|
||||
@@ -723,56 +724,56 @@ berkeley_db_javasvc: $(rpc_jarfile)
|
||||
@@ -644,7 +646,7 @@ $(libdb_version): $(C_OBJS)
|
||||
|
||||
# Shared C library.
|
||||
$(libso_target): $(C_OBJS)
|
||||
- $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBSO_LIBS)
|
||||
+ $(dbLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBSO_LIBS)
|
||||
|
||||
# Static C++ library named libdb_cxx.a.
|
||||
$(libcxx): $(DEF_LIB_CXX)
|
||||
@@ -671,7 +673,7 @@ $(libjso_target): $(JAVA_OBJS) $(C_OBJS)
|
||||
|
||||
# Shared Tcl library.
|
||||
$(libtso_target): $(TCL_OBJS) $(C_OBJS)
|
||||
- $(SOLINK) @LIBTSO_MODULE@ $(SOFLAGS) $(LDFLAGS) \
|
||||
+ $(dbtclLINK) @LIBTSO_MODULE@ $(SOFLAGS) $(LDFLAGS) \
|
||||
-o $@ $(TCL_OBJS) $(C_OBJS) $(LIBTSO_LIBS)
|
||||
|
||||
##################################################
|
||||
@@ -723,56 +725,56 @@ berkeley_db_javasvc: $(rpc_jarfile)
|
||||
echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@
|
||||
chmod +x $@
|
||||
|
||||
@ -138,7 +166,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
$(CCLINK) -o $@ $(LDFLAGS) \
|
||||
db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
|
||||
$(POSTLINK) $@
|
||||
@@ -797,7 +798,7 @@ install_include:
|
||||
@@ -797,7 +799,7 @@ install_include:
|
||||
($(mkdir) -p $(DESTDIR)$(includedir) && \
|
||||
$(chmod) $(dmode) $(DESTDIR)$(includedir))
|
||||
@cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT)
|
||||
@ -147,7 +175,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
@cd $(DESTDIR)$(includedir) && $(chmod) $(fmode) $(INCDOT)
|
||||
|
||||
uninstall_include:
|
||||
@@ -820,6 +821,10 @@ install_lib:
|
||||
@@ -820,6 +822,10 @@ install_lib:
|
||||
test -f $(libjso) && $(ln) -s $(libjso) $(libjso_default); \
|
||||
test -f $(libjso) && $(ln) -s $(libjso) $(libjso_major); \
|
||||
test -f $(libjso) && $(ln) -s $(libjso) $(libjso_g)) || true
|
||||
@ -158,7 +186,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.6 2005/11/01 15:44:24 bernd Exp $
|
||||
@(test -f $(libj_jarfile) && \
|
||||
$(cp) $(libj_jarfile) $(DESTDIR)$(libdir) && \
|
||||
$(chmod) $(fmode) $(DESTDIR)$(libdir)/$(libj_jarfile)) || true
|
||||
@@ -853,6 +858,7 @@ install_docs:
|
||||
@@ -853,6 +859,7 @@ install_docs:
|
||||
$(chmod) $(dmode) $(DESTDIR)$(docdir))
|
||||
@cd $(DESTDIR)$(docdir) && $(rm) -rf $(DOCLIST)
|
||||
@cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-dist_configure,v 1.5 2005/11/03 23:12:45 brad Exp $
|
||||
--- dist/configure.orig Wed Dec 3 16:10:02 2003
|
||||
+++ dist/configure Thu Nov 3 17:30:31 2005
|
||||
$OpenBSD: patch-dist_configure,v 1.6 2005/12/25 20:35:42 sturm Exp $
|
||||
--- dist/configure.orig Wed Dec 3 22:10:02 2003
|
||||
+++ dist/configure Sun Dec 25 20:49:31 2005
|
||||
@@ -5889,12 +5889,10 @@ nto-qnx | nto-qnx6*)
|
||||
;;
|
||||
|
||||
@ -45,7 +45,7 @@ $OpenBSD: patch-dist_configure,v 1.5 2005/11/03 23:12:45 brad Exp $
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -20135,13 +20148,13 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
|
||||
@@ -20135,13 +20148,14 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
|
||||
|
||||
|
||||
|
||||
@ -54,15 +54,16 @@ $OpenBSD: patch-dist_configure,v 1.5 2005/11/03 23:12:45 brad Exp $
|
||||
|
||||
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
|
||||
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
|
||||
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info ${DB_VERSION_MAJOR}:${DB_VERSION_MINOR}"
|
||||
+MAKEFILE_dbLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} \${libdb_la_LDFLAGS}"
|
||||
+MAKEFILE_dbtclLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} \${libdb_tcl_la_LDFLAGS}"
|
||||
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
|
||||
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
|
||||
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
|
||||
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info ${DB_VERSION_MAJOR}:${DB_VERSION_MINOR}"
|
||||
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} \${libdb_cxx_la_LDFLAGS}"
|
||||
MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
|
||||
|
||||
LIBTOOL="\$(SHELL) ./libtool"
|
||||
@@ -21441,7 +21454,7 @@ fi
|
||||
@@ -21441,7 +21455,7 @@ fi
|
||||
|
||||
# Optional utilities.
|
||||
if test "$db_cv_dump185" = "yes"; then
|
||||
@ -71,7 +72,7 @@ $OpenBSD: patch-dist_configure,v 1.5 2005/11/03 23:12:45 brad Exp $
|
||||
fi
|
||||
|
||||
# Checks for include files, structures, C types.
|
||||
@@ -28525,7 +28538,7 @@ int
|
||||
@@ -28525,7 +28539,7 @@ int
|
||||
main ()
|
||||
{
|
||||
|
||||
@ -80,3 +81,13 @@ $OpenBSD: patch-dist_configure,v 1.5 2005/11/03 23:12:45 brad Exp $
|
||||
exit(0);
|
||||
#else
|
||||
FAIL TO COMPILE/LINK
|
||||
@@ -31043,7 +31057,8 @@ s,@MAKEFILE_CC@,$MAKEFILE_CC,;t t
|
||||
s,@MAKEFILE_CCLINK@,$MAKEFILE_CCLINK,;t t
|
||||
s,@MAKEFILE_CXX@,$MAKEFILE_CXX,;t t
|
||||
s,@MAKEFILE_CXXLINK@,$MAKEFILE_CXXLINK,;t t
|
||||
-s,@MAKEFILE_SOLINK@,$MAKEFILE_SOLINK,;t t
|
||||
+s,@MAKEFILE_dbLINK@,$MAKEFILE_dbLINK,;t t
|
||||
+s,@MAKEFILE_dbtclLINK@,$MAKEFILE_dbtclLINK,;t t
|
||||
s,@MAKEFILE_XSOLINK@,$MAKEFILE_XSOLINK,;t t
|
||||
s,@OSDIR@,$OSDIR,;t t
|
||||
s,@POSTLINK@,$POSTLINK,;t t
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.7 2004/09/14 23:31:45 espie Exp $
|
||||
@lib lib/db4/libdb.so.4.2
|
||||
@lib lib/db4/libdb_cxx.so.4.2
|
||||
@lib lib/libdb.so.4.2
|
||||
@lib lib/libdb_cxx.so.4.2
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.8 2005/12/25 20:35:42 sturm Exp $
|
||||
@lib lib/db4/libdb.so.${LIBdb_VERSION}
|
||||
@lib lib/db4/libdb_cxx.so.${LIBdb_cxx_VERSION}
|
||||
@lib lib/libdb.so.${LIBdb_VERSION}
|
||||
@lib lib/libdb_cxx.so.${LIBdb_cxx_VERSION}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2005/09/16 09:51:26 espie Exp $
|
||||
@pkgpath databases/db/v4,no_tcl
|
||||
@comment $OpenBSD: PLIST,v 1.9 2005/12/25 20:35:42 sturm Exp $
|
||||
@option no-default-conflict
|
||||
@conflict db->=4,<5
|
||||
@pkgpath databases/db/v4,no_tcl
|
||||
bin/db4_archive
|
||||
bin/db4_checkpoint
|
||||
bin/db4_deadlock
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
@comment $OpenBSD: PLIST-tcl,v 1.1 2004/09/24 20:47:22 sturm Exp $
|
||||
@comment $OpenBSD: PLIST-tcl,v 1.2 2005/12/25 20:35:42 sturm Exp $
|
||||
@option no-default-conflict
|
||||
@conflict db-tcl->=4,<5
|
||||
lib/db4/libdb_tcl.a
|
||||
lib/db4/libdb_tcl.la
|
||||
@comment lib/db4/libdb_tcl.so
|
||||
@comment lib/db4/libdb_tcl.so.4
|
||||
@lib lib/db4/libdb_tcl.so.4.2
|
||||
@lib lib/libdb_tcl.so.4.2
|
||||
@lib lib/db4/libdb_tcl.so.${LIBdb_tcl_VERSION}
|
||||
@lib lib/libdb_tcl.so.${LIBdb_tcl_VERSION}
|
||||
share/doc/db4/api_tcl/
|
||||
share/doc/db4/api_tcl/db_close.html
|
||||
share/doc/db4/api_tcl/db_count.html
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user