diff options
Diffstat (limited to 'databases/db3/files')
| -rw-r--r-- | databases/db3/files/patch-dist::Makefile.in | 147 | ||||
| -rw-r--r-- | databases/db3/files/patch-dist::configure | 37 |
2 files changed, 88 insertions, 96 deletions
diff --git a/databases/db3/files/patch-dist::Makefile.in b/databases/db3/files/patch-dist::Makefile.in index 5e0f454ea8c0..aeb257e31f24 100644 --- a/databases/db3/files/patch-dist::Makefile.in +++ b/databases/db3/files/patch-dist::Makefile.in @@ -1,86 +1,88 @@ ---- ../dist/Makefile.in.orig Fri Dec 1 02:07:33 2000 -+++ ../dist/Makefile.in Tue Dec 25 13:10:15 2001 -@@ -33,12 +33,12 @@ +--- ../dist/Makefile.in.orig Fri Jul 6 15:53:16 2001 ++++ ../dist/Makefile.in Tue May 14 12:26:13 2002 +@@ -11,7 +11,7 @@ + bindir= @bindir@ + includedir=@includedir@ + libdir= @libdir@ +-docdir= $(prefix)/docs ++docdir= $(prefix)/share/doc/db3 - libdb= libdb.a + dmode= 755 + emode= 555 +@@ -61,12 +61,12 @@ + LIBSO_LIBS= @LIBSO_LIBS@ + libdb= libdb.a -libso_base= libdb --libso_linkname= $(libso_base)-$(SOVERSION).la -libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ +-libso_static= $(libso_base)-$(SOVERSION).a -libso_target= $(libso_base)-$(SOVERSION).la +libso_base= libdb$(SOMAJOR) -+libso_linkname= $(libso_base).la +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@.2 ++libso_major= $(libso_base).@SOSUFFIX@.3 ################################################## - # C++ -@@ -47,12 +47,12 @@ - # You must configure it using: - # --enable-cxx - ################################################## + # C++ API. +@@ -78,13 +78,13 @@ + CXXLINK= @MAKEFILE_CXXLINK@ + 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= libdb3_cxx.a +libxso_base= libdb3_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@.2 ++libxso_major= $(libxso_base).@SOSUFFIX@.3 ################################################## - # JAVA -@@ -115,7 +115,7 @@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/db3 + # Java API. +@@ -239,8 +239,8 @@ + perf_util@o@ - dmode= 755 - emode= 555 -@@ -192,8 +192,8 @@ - db_dump@o@ db_load@o@ db_printlog@o@ db_recover@o@ db_stat@o@ \ - db_upgrade@o@ db_verify@o@ util_log@o@ util_sig@o@ - --PROGS= @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \ + UTIL_PROGS=\ +- @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \ - db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify -+PROGS= @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \ ++ @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \ + db3_dump db3_load db3_printlog db3_recover db3_stat db3_upgrade db3_verify - JAVA_DBSRCS=\ - $(JAVA_DBDIR)/Db.java $(JAVA_DBDIR)/DbAppendRecno.java \ -@@ -279,53 +279,53 @@ - $(CCLINK) -o $@ $(LDFLAGS) $(RPC_SRV) util_log@o@ $(LIBDB_ARGS) $(LIBS) + ################################################## + # We're building a standard library or a RPM file hierarchy, potentially +@@ -298,53 +298,53 @@ + $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ --db_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@ +-db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) ++db3_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_archive@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ --db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ +-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) ++db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_checkpoint@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ --db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ +-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) ++db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_deadlock@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ --db_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@ - $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) +-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB) ++db3_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@ @@ -88,58 +90,61 @@ $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB) $(POSTLINK) $@ --db_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@ - $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) +-db_load: db_load@o@ util_sig@o@ $(DEF_LIB) ++db3_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@ @DEFAULT_LIB@ -+db3_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@ +-db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) ++db3_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_printlog@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ --db_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@ +-db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) ++db3_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_recover@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ --db_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@ - $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) +-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB) ++db3_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@ @DEFAULT_LIB@ -+db3_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@ +-db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) ++db3_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_upgrade@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ --db_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@ -+db3_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@ +-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) ++db3_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_verify@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ -@@ -452,8 +452,8 @@ +@@ -401,10 +401,9 @@ @cd $(libdir) && $(rm) -f \ - $(libso_target) $(libso) $(libso_default) $(libso_major) + $(libso) $(libso_target) $(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) +- @cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target) ++ @$(rm) -f $(libdir)/$(libso_target) ++ @cd $(libdir) && $(chmod) $(fmode) $(libso) - install_dynamic_cxx: -@@ -463,8 +463,8 @@ + install_static_cxx: + @echo "Installing DB C++ static library: $(libdir) ..." +@@ -421,9 +420,8 @@ @cd $(libdir) && $(rm) -f \ - $(libxso_target) $(libxso) $(libxso_default) $(libxso_major) + $(libxso) $(libxso_target) $(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) +- @cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target) ++ @$(rm) -f $(libdir)/$(libxso_target) ++ @cd $(libdir) && $(chmod) $(fmode) $(libxso) install_tcl: @echo "Installing DB Tcl library: $(libdir) ..." diff --git a/databases/db3/files/patch-dist::configure b/databases/db3/files/patch-dist::configure index eb05bc929de4..48e44c8708c1 100644 --- a/databases/db3/files/patch-dist::configure +++ b/databases/db3/files/patch-dist::configure @@ -1,33 +1,20 @@ ---- ../dist/configure.orig Tue Dec 25 12:41:16 2001 -+++ ../dist/configure Tue Dec 25 12:50:29 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; } +--- ../dist/configure.orig Tue May 14 12:23:44 2002 ++++ ../dist/configure Tue May 14 12:24:11 2002 +@@ -8449,7 +8449,7 @@ + MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}" + MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${SAVE_CXX}" -@@ -1644,7 +1644,7 @@ +-SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version" ++SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info ${DB_VERSION_MINOR}" + INSTALLER="\$(LIBTOOL) --mode=install cp" - 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 -@@ -2093,7 +2093,7 @@ - fi + # Configure for shared libraries, static libraries, or both. If both are +@@ -9100,7 +9100,7 @@ + # Optional utilities. if test "$db_cv_dump185" = "yes"; then - ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" + ADDITIONAL_PROGS="db3_dump185 $ADDITIONAL_PROGS" fi - echo $ac_n "checking for pthread_create in "-pthread"""... $ac_c" 1>&6 + # test servers, example programs. |