Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 21 years ago
parent
commit
5531a1db2c
2 changed files with 55 additions and 13 deletions
  1. +0
    -1
      package/base/bdb/bdb.conf
  2. +55
    -12
      package/base/bdb/noinst-major.patch_bdb42

+ 0
- 1
package/base/bdb/bdb.conf

@ -41,7 +41,6 @@ is_bdb_default() {
if ! is_bdb_default; then if ! is_bdb_default; then
var_append confopt ' ' "--program-transform-name='s/db/${xpkg:1}/'" var_append confopt ' ' "--program-transform-name='s/db/${xpkg:1}/'"
var_append makeinstopt ' ' "transform='s/db/${xpkg:1}/'" var_append makeinstopt ' ' "transform='s/db/${xpkg:1}/'"
# var_append INSTALL_WRAPPER_FILTER "|" 'sed "s,bin/db,bin/${xpkg:1},"'
fi fi
# bdb doesn't like some of our make options # bdb doesn't like some of our make options

+ 55
- 12
package/base/bdb/noinst-major.patch_bdb42

@ -1,35 +1,78 @@
--- ./dist/Makefile.in.orig 2004-06-25 00:15:26.156739872 +0200
+++ ./dist/Makefile.in 2004-06-25 00:17:37.499772696 +0200
@@ -590,27 +590,14 @@
# List of files installed into the library directory.
--- ./dist/Makefile.in.orig 2004-09-13 20:33:27.000000000 +0200
+++ ./dist/Makefile.in 2004-09-13 20:43:02.000000000 +0200
@@ -61,12 +61,10 @@
LIBSO_LIBS= @LIBSO_LIBS@
libdb_base= libdb
-libdb= $(libdb_base).a
+libdb= $(libdb_base)-$(LIBVERSION).a
libdb_version= $(libdb_base)-$(LIBVERSION).a
libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
libso_target= $(libdb_base)-$(LIBVERSION).la
-libso_default= $(libdb_base)@SOSUFFIX@
-libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
################################################## ##################################################
# C++ API.
@@ -80,12 +78,10 @@
LIBXSO_LIBS= @LIBXSO_LIBS@
libcxx_base= libdb_cxx
-libcxx= $(libcxx_base).a
+libcxx= $(libcxx_base)-$(LIBVERSION).a
libcxx_version= $(libcxx_base)-$(LIBVERSION).a
libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
libxso_target= $(libcxx_base)-$(LIBVERSION).la
-libxso_default= $(libcxx_base)@SOSUFFIX@
-libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
##################################################
# Java API.
@@ -115,8 +111,6 @@
libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
libjso_static= $(libjso_base)-$(LIBVERSION).a
libjso_target= $(libjso_base)-$(LIBVERSION).la
-libjso_default= $(libjso_base)@JMODSUFFIX@
-libjso_major= $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@
libjso_g= $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@
##################################################
@@ -130,8 +124,6 @@
libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
libtso_static= $(libtso_base)-$(LIBVERSION).a
libtso_target= $(libtso_base)-$(LIBVERSION).la
-libtso_default= $(libtso_base)@MODSUFFIX@
-libtso_major= $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@
##################################################
# db_dump185 UTILITY
@@ -592,25 +584,17 @@
LIB_INSTALL_FILE_LIST=\ LIB_INSTALL_FILE_LIST=\
- $(libdb) \
- $(libso) \
$(libdb) \
$(libso) \
- $(libso_default) \ - $(libso_default) \
- $(libso_major) \ - $(libso_major) \
$(libdb_version) \ $(libdb_version) \
$(libso_target) \ $(libso_target) \
- $(libcxx) \
- $(libxso) \
$(libcxx) \
$(libxso) \
- $(libxso_default) \ - $(libxso_default) \
- $(libxso_major) \ - $(libxso_major) \
$(libcxx_version) \ $(libcxx_version) \
$(libxso_target) \ $(libxso_target) \
- $(libtso) \
$(libtso) \
- $(libtso_default) \ - $(libtso_default) \
- $(libtso_major) \ - $(libtso_major) \
$(libtso_static) \ $(libtso_static) \
$(libtso_target) \ $(libtso_target) \
- $(libjso) \
$(libjso) \
- $(libjso_default) \ - $(libjso_default) \
$(libjso_g) \ $(libjso_g) \
- $(libjso_major) \ - $(libjso_major) \
+ $(libjso_default) \
$(libjso_static) \ $(libjso_static) \
$(libjso_target) \ $(libjso_target) \
$(libj_exjarfile) \ $(libj_exjarfile) \
@@ -811,14 +798,6 @@
@@ -811,14 +795,6 @@
@cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST) @cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir) @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
@(cd $(DESTDIR)$(libdir) && \ @(cd $(DESTDIR)$(libdir) && \

Loading…
Cancel
Save