FreeBSD Bugzilla – Attachment 169277 Details for
Bug 208740
databases/db[5-6]: enable Tcl extension, modernize Makefile
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Changes for db5
db5.diff.txt (text/plain), 5.44 KB, created by
Pietro Cerutti
on 2016-04-13 07:44:45 UTC
(
hide
)
Description:
Changes for db5
Filename:
MIME Type:
Creator:
Pietro Cerutti
Created:
2016-04-13 07:44:45 UTC
Size:
5.44 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 413174) >+++ Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= db5 > PORTVERSION= 5.3.28 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= databases java > MASTER_SITES= http://download.oracle.com/berkeley-db/ > PKGNAMEPREFIX?= >@@ -19,7 +19,6 @@ > BDBMAJ= ${BDBVER:R} > CONFIGURE_ARGS= --enable-cxx --enable-stl \ > --enable-compat185 --enable-dump185 \ >- --disable-tcl \ > --includedir=${PREFIX}/include/${PORTNAME} \ > --libdir=${PREFIX}/lib/${PORTNAME} \ > --bindir=${PREFIX}/bin/${PORTNAME} >@@ -30,68 +29,49 @@ > WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix > USE_LDCONFIG= yes > PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} >+MAKE_ARGS+= docdir=${DOCSDIR} > >-OPTIONS_DEFINE= CRYPTO L10N SQL JAVA DOCS >+OPTIONS_DEFINE= CRYPTO L10N SQL JAVA TCL DOCS > OPTIONS_DEFAULT=CRYPTO >+OPTIONS_SUB= yes > CRYPTO_DESC= Cryptography support > L10N_DESC= Localization support (EXPERIMENTAL) > SQL_DESC= Enable SQL API (EXPERIMENTAL) > >+PORTDOCS= * >+ >+DBLIBS= libdb libdb_cxx libdb_stl >+ >+DEBUG_CONFIGURE_ENABLE= debug umrw >+CRYPTO_CONFIGURE_WITH= cryptography=yes >+L10N_CONFIGURE_ENABLE= localization >+SQL_CONFIGURE_ENABLE= sql sql_codegen >+SQL_VARS= DBLIBS+=libdb_sql >+JAVA_USE= java >+JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION=1.6+ >+JAVA_CONFIGURE_ENABLE= java >+JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" >+JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" >+TCL_CONFIGURE_ENABLE= tcl >+TCL_USES= tcl:85+ >+TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR} >+TCL_VARS= DBLIBS+=libdb_tcl >+DOCS_INSTALL_TARGET= install_docs >+ > .include <bsd.port.options.mk> > > .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*} > # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 >-# also bug#205001 >+# and also bug#205001 > CONFIGURE_ARGS+= --enable-posixmutexes > .endif > >-.if ${PORT_OPTIONS:MDOCS} >-INSTALL_TARGET+=install_docs docdir=${DOCSDIR} >-PORTDOCS= * >-.endif >- >-.if ${PORT_OPTIONS:MSQL} >-CONFIGURE_ARGS+= --enable-sql_codegen --enable-sql >-PLIST_SUB+= SQL="" >-libdb_sql= libdb_sql >-.else >-PLIST_SUB+= SQL="@comment " >-libdb_sql= >-.endif >- >-.if ${PORT_OPTIONS:MJAVA} >-USE_JAVA= yes >-JAVA_VERSION= 1.6+ >-CONFIGURE_ARGS+= --enable-java >-CPPFLAGS+= "-I${JAVA_HOME}/include" >-CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" >-PLIST_SUB+= JAVA="" >-libdb_java= libdb_java >-.else >-PLIST_SUB+= JAVA="@comment " >-libdb_java= >-.endif >- >-.if ${PORT_OPTIONS:MCRYPTO} >-CONFIGURE_ARGS+= --with-cryptography=yes >-.else >-CONFIGURE_ARGS+= --with-cryptography=no >-.endif >- >-.if ${PORT_OPTIONS:ML10N} >-CONFIGURE_ARGS+= --enable-localization >-.endif >- >-.if ${PORT_OPTIONS:MDEBUG} >-CONFIGURE_ARGS+= --enable-debug --enable-umrw >-.endif >- > post-patch: > ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in > ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* > > post-install: >-.for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java} >+.for i in ${DBLIBS} > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 > ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib > ${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${STAGEDIR}${PREFIX}/lib >@@ -119,5 +99,10 @@ > ${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql > .endif > .endif >+.if !empty(PORT_OPTIONS:MTCL) >+ echo "package ifneeded Db_tcl ${BDBVER} \ >+ [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \ >+ " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl >+.endif > > .include <bsd.port.mk> >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 413174) >+++ pkg-plist (working copy) >@@ -123,3 +123,15 @@ > lib/libdb_stl-%%BDBMAJ%%.so.0 > lib/libdb_stl-%%BDBVER%%.so > lib/libdb_stl-%%BDBVER%%.so.0 >+%%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.a >+%%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.so >+%%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.so.0 >+%%TCL%%lib/db5/libdb_tcl-%%BDBVER%%.so.0.0.0 >+%%TCL%%lib/db5/libdb_tcl-5.so >+%%TCL%%lib/db5/libdb_tcl.a >+%%TCL%%lib/db5/libdb_tcl.so >+%%TCL%%lib/db5/pkgIndex.tcl >+%%TCL%%lib/libdb_tcl-%%BDBVER%%.so >+%%TCL%%lib/libdb_tcl-%%BDBVER%%.so.0 >+%%TCL%%lib/libdb_tcl-5.so >+%%TCL%%lib/libdb_tcl-5.so.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 208740
:
169236
|
169239
|
169276
| 169277