From 77e9c7575a25cc58318f8dc7e8257100be697365 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Mon, 24 Dec 2001 10:45:47 +0000 Subject: patch for 4.0.14 PR: 32533 Submitted by: "Sergey A. Osokin" (maintainer) --- databases/db43/files/patch-aa | 63 ------------- databases/db43/files/patch-ab | 24 ----- databases/db43/files/patch-dist::Makefile.in | 135 +++++++++++++++++++++++++++ databases/db43/files/patch-dist::configure | 24 +++++ 4 files changed, 159 insertions(+), 87 deletions(-) delete mode 100644 databases/db43/files/patch-aa delete mode 100644 databases/db43/files/patch-ab create mode 100644 databases/db43/files/patch-dist::Makefile.in create mode 100644 databases/db43/files/patch-dist::configure (limited to 'databases/db43/files') diff --git a/databases/db43/files/patch-aa b/databases/db43/files/patch-aa deleted file mode 100644 index 6155cc9b8de3..000000000000 --- a/databases/db43/files/patch-aa +++ /dev/null @@ -1,63 +0,0 @@ ---- ../dist/Makefile.in.orig Thu Nov 30 17:07:33 2000 -+++ ../dist/Makefile.in Tue May 29 11:11:15 2001 -@@ -34,11 +34,11 @@ - libdb= libdb.a - - libso_base= libdb --libso_linkname= $(libso_base)-$(SOVERSION).la --libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ --libso_target= $(libso_base)-$(SOVERSION).la -+libso_linkname= $(libso_base)$(SOMAJOR).la -+libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@ -+libso_target= $(libso_base)$(SOMAJOR).la - libso_default= $(libso_base).@SOSUFFIX@ --libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@ -+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.2 - - ################################################## - # C++ -@@ -49,10 +49,10 @@ - ################################################## - libcxx= libdb_cxx.a - libxso_base= libdb_cxx --libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@ --libxso_target= $(libxso_base)-$(SOVERSION).la -+libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@ -+libxso_target= $(libxso_base)$(SOMAJOR).la - libxso_default= $(libxso_base).@SOSUFFIX@ --libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@ -+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.2 - - ################################################## - # JAVA -@@ -115,7 +115,7 @@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/db3 - - dmode= 755 - emode= 555 -@@ -452,8 +452,8 @@ - @cd $(libdir) && $(rm) -f \ - $(libso_target) $(libso) $(libso_default) $(libso_major) - @$(INSTALLER) $(libso_target) $(libdir) -- @cd $(libdir) && $(ln) -s $(libso) $(libso_default) -- @cd $(libdir) && $(ln) -s $(libso) $(libso_major) -+ @cd $(libdir) && $(chmod) $(fmode) $(libso_major) -+ @cd $(libdir) && $(ln) -s $(libso_major) $(libso_default) - @$(LIBTOOL) --mode=finish $(libdir) - - install_dynamic_cxx: -@@ -463,8 +463,8 @@ - @cd $(libdir) && $(rm) -f \ - $(libxso_target) $(libxso) $(libxso_default) $(libxso_major) - @$(INSTALLER) $(libxso_target) $(libdir) -- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default) -- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major) -+ @cd $(libdir) && $(chmod) $(fmode) $(libxso_major) -+ @cd $(libdir) && $(ln) -s $(libxso_major) $(libxso_default) - - install_tcl: - @echo "Installing DB Tcl library: $(libdir) ..." diff --git a/databases/db43/files/patch-ab b/databases/db43/files/patch-ab deleted file mode 100644 index 50bab3b542f2..000000000000 --- a/databases/db43/files/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ ---- ../dist/configure.orig Tue May 29 10:55:53 2001 -+++ ../dist/configure Tue May 29 11:07:37 2001 -@@ -1626,9 +1626,9 @@ - echo $ac_n "checking libtool configuration""... $ac_c" 1>&6 - echo "configure:1628: checking libtool configuration" >&5 - echo "$ac_t""" 1>&6 -- ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \ -- --no-verify $srcdir/ltmain.sh \ -- --output=./libtool $host_os \ -+ ${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig \ -+ --no-verify --disable-ltlibs %%LOCALBASE%%/share/libtool/ltmain.sh $target \ -+ --output=./libtool \ - --disable-static \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - -@@ -1644,7 +1644,7 @@ - - INSTALLER="\$(LIBTOOL) --mode=install cp" - POSTLINK="\$(LIBTOOL) --mode=execute true" -- SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version" -+ SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info ${DB_VERSION_MINOR}" - SOFLAGS="-rpath \$(libdir)" - o=".lo" - fi diff --git a/databases/db43/files/patch-dist::Makefile.in b/databases/db43/files/patch-dist::Makefile.in new file mode 100644 index 000000000000..136ab161efdc --- /dev/null +++ b/databases/db43/files/patch-dist::Makefile.in @@ -0,0 +1,135 @@ +--- ../dist/Makefile.in.orig Sat Nov 10 01:48:45 2001 ++++ ../dist/Makefile.in Wed Dec 5 13:38:23 2001 +@@ -11,7 +11,7 @@ + bindir= @bindir@ + includedir=@includedir@ + libdir= @libdir@ +-docdir= $(prefix)/docs ++docdir= $(prefix)/share/doc/db4 + + dmode= 755 + emode= 555 +@@ -45,6 +45,7 @@ + SOLINK= @MAKEFILE_SOLINK@ + SOFLAGS= @SOFLAGS@ + SOMAJOR= @DB_VERSION_MAJOR@ ++SOMINOR= @DB_VERSION_MINOR@ + SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ + + ################################################## +@@ -60,13 +61,13 @@ + LIBS= @LIBS@ + LIBSO_LIBS= @LIBSO_LIBS@ + +-libdb= libdb.a +-libso_base= libdb +-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ +-libso_static= $(libso_base)-$(SOVERSION).a +-libso_target= $(libso_base)-$(SOVERSION).la ++libdb= libdb4.a ++libso_base= libdb4 ++libso= $(libso_base).@SOSUFFIX@ ++libso_static= $(libso_base).a ++libso_target= $(libso_base).la + libso_default= $(libso_base).@SOSUFFIX@ +-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@ ++libso_major= $(libso_base).@SOSUFFIX@.$(SOMINOR) + + ################################################## + # C++ API. +@@ -79,13 +80,13 @@ + XSOLINK= @MAKEFILE_XSOLINK@ + LIBXSO_LIBS= @LIBXSO_LIBS@ + +-libcxx= libdb_cxx.a +-libxso_base= libdb_cxx +-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@ +-libxso_static= $(libxso_base)-$(SOVERSION).a +-libxso_target= $(libxso_base)-$(SOVERSION).la ++libcxx= libdb4_cxx.a ++libxso_base= libdb4_cxx ++libxso= $(libxso_base).@SOSUFFIX@ ++libxso_static= $(libxso_base).a ++libxso_target= $(libxso_base).la + libxso_default= $(libxso_base).@SOSUFFIX@ +-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@ ++libxso_major= $(libxso_base).@SOSUFFIX@.$(SOMINOR) + + ################################################## + # Java API. +@@ -235,8 +236,8 @@ + db_server_proc@o@ db_server_svc@o@ db_server_util@o@ gen_db_server@o@ + + UTIL_PROGS=\ +- @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \ +- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify ++ @ADDITIONAL_PROGS@ db4_archive db4_checkpoint db4_deadlock \ ++ db4_dump db4_load db4_printlog db4_recover db4_stat db4_upgrade db4_verify + + ################################################## + # List of files installed into the library directory. +@@ -330,53 +331,53 @@ + $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) ++db4_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) ++db4_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) ++db4_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB) ++db4_dump: db_dump@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_dump185: db_dump185@o@ @LIBOBJS@ ++db4_dump185: db_dump185@o@ @LIBOBJS@ + $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB) + $(POSTLINK) $@ + +-db_load: db_load@o@ util_sig@o@ $(DEF_LIB) ++db4_load: db_load@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) ++db4_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) ++db4_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB) ++db4_stat: db_stat@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) ++db4_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + +-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) ++db4_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ diff --git a/databases/db43/files/patch-dist::configure b/databases/db43/files/patch-dist::configure new file mode 100644 index 000000000000..4f2ed615df05 --- /dev/null +++ b/databases/db43/files/patch-dist::configure @@ -0,0 +1,24 @@ +--- ../dist/configure.orig Wed Dec 5 13:14:02 2001 ++++ ../dist/configure Wed Dec 5 13:24:01 2001 +@@ -8794,10 +8794,10 @@ + INSTALLER="\$(LIBTOOL) --mode=install cp" + + 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_MINOR}" + 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_MINOR}" + MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" + + # Configure for shared libraries, static libraries, or both. If both are +@@ -9511,7 +9511,7 @@ + + # Optional utilities. + if test "$db_cv_dump185" = "yes"; then +- ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" ++ ADDITIONAL_PROGS="db4_dump185 $ADDITIONAL_PROGS" + fi + + # Checks for system/compiler characteristics. -- cgit v1.2.3