Attachment #142149 for bug #189131

Lines 28-33 Link Here

(-)Makefile (+1 lines)
28	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py	28	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py
29	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h	29	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h
30	${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py	30	${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py
		31	${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup3.py
31		32
32	post-install:	33	post-install:
33	@${MKDIR} ${STAGEDIR}${DOCSDIR}	34	@${MKDIR} ${STAGEDIR}${DOCSDIR}




     else:
         if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
         libname = []
@@ -332,7 +329,7 @@
 
     # read db.h to figure out what version of Berkeley DB this is
     ver = None
-    db_h_lines = open(os.path.join(incdir, 'db.h'), 'r').readlines()
+    db_h_lines = open('%%BDB_INCLUDE_DIR%%/db.h', 'r').readlines()
     db_ver_re = re.compile(
         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
     db_ver2 = db_ver

Return to bug 189131

Lines 23-25 Link Here

(-)files/patch-setup3.py (+9 lines)
23	else:	23	else:
24	if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")	24	if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
25	libname = []	25	libname = []
		26	@@ -332,7 +329,7 @@
		27
		28	# read db.h to figure out what version of Berkeley DB this is
		29	ver = None
		30	- db_h_lines = open(os.path.join(incdir, 'db.h'), 'r').readlines()
		31	+ db_h_lines = open('%%BDB_INCLUDE_DIR%%/db.h', 'r').readlines()
		32	db_ver_re = re.compile(
		33	r'^#define\s+DB_VERSION_STRING\s.Berkeley DB (\d+\.\d+).')
		34	db_ver2 = db_ver