Attachment 162195 Details for Bug 193641 – proposed fix, including the added patch

[patch] proposed fix, including the added patch

bacula-diff (text/plain), 4.78 KB, created by Larry Rosenman on 2015-10-19 00:55:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Rosenman

Created: 2015-10-19 00:55:52 UTC

Size: 4.78 KB

patch

obsolete

>Index: sysutils/bacula-server/Makefile
>===================================================================
>--- sysutils/bacula-server/Makefile	(revision 398952)
>+++ sysutils/bacula-server/Makefile	(working copy)
>@@ -28,8 +28,9 @@
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+#LER: These pollute the environment, and break things.
>+#CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
>+#LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS
> OPTIONS_DEFAULT?=	NLS PGSQL
>@@ -41,7 +42,7 @@
> PYTHON_CONFIGURE_ON=	--with-python=yes
> 
> .if !defined(WITH_CLIENT_ONLY)
>-LIB_DEPENDS+=	libbac.so:${PORTSDIR}/sysutils/bacula-client
>+LIB_DEPENDS+=	libbac-${DISTVERSION}.so:${PORTSDIR}/sysutils/bacula-client
> USE_RC_SUBR?=	bacula-dir bacula-sd
> .endif
> 
>@@ -51,12 +52,20 @@
> SUB_FILES+=	pkg-message.server
> .endif
> 
>+#LER: We use this instead of USES+= readline since the USES pollutes the LDFLAGS environment
>+.if !exists(/usr/lib/libreadline.so)
>+LIB_DEPENDS+=	libreadline.so.6:${PORTSDIR}/devel/readline
>+readline_ARGS=	/usr/local
>+.else
>+readline_ARGS=	yes
>+.endif
>+
> CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
> 		--enable-smartalloc \
> 		--sysconfdir=${ETCDIR} \
> 		--with-working-dir=${BACULA_DIR} \
> 		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
>-		--with-readline=yes \
>+		--with-readline=${readline_ARGS} \
> 		--disable-conio \
> 		--enable-batch-insert \
> 		--with-plugindir=${PREFIX}/lib \
>@@ -115,7 +124,8 @@
> SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
> SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
> PGSQL_CONFIGURE_ON=	--with-postgresql=yes
>-PGSQL_USES=		pgsql
>+#LER: This pollutes the environment, and the port uses pg_config
>+#PGSQL_USES=		pgsql
> 
> MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
> 
>@@ -145,7 +155,7 @@
> 
> post-patch:
> 	# This port does not install docs.  See bacula-docs for that
>-	@${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's@docdir@@' ${WRKSRC}/Makefile.in
> 	# Change $(ECHO) to echo in some Makefile.in files
> 	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g'  \
> 		${WRKSRC}/src/filed/Makefile.in   \
>@@ -165,8 +175,9 @@
> 	@${REINPLACE_CMD} -e 's|$.*$${MKDIR} $${DESTDIR}$${scriptdir}$|#\1|g' ${WRKSRC}/Makefile.in
> .else
> 	# In server port don't install filed
>-	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
>-		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
>+	#LER: This mucks up the build
>+	#@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
>+	#	-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} \
> 		-e 's|../lib/[^[:space:]]*||g' \
> 		-e 's|../findlib/[^[:space:]]*||g' \
>Index: sysutils/bacula-server/files/patch-src_console_Makefile.in
>===================================================================
>--- sysutils/bacula-server/files/patch-src_console_Makefile.in	(revision 0)
>+++ sysutils/bacula-server/files/patch-src_console_Makefile.in	(working copy)
>@@ -0,0 +1,26 @@
>+--- src/console/Makefile.in.orig	2015-08-13 13:52:24 UTC
>++++ src/console/Makefile.in
>+@@ -48,12 +48,12 @@ all: Makefile bconsole @STATIC_CONS@
>+ 
>+ 
>+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
>+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
>++	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
>+ 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
>+ 	      $(OPENSSL_LIBS)
>+ 
>+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
>+-	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
>++	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
>+ 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
>+ 	      $(OPENSSL_LIBS)
>+ 	strip $@
>+@@ -121,7 +121,7 @@ uninstall:
>+ depend:
>+ 	@$(MV) Makefile Makefile.bak
>+ 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
>+-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
>++	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
>+ 	@$(CXX) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
>+ 	@if test -f Makefile ; then \
>+ 	    $(RMF) Makefile.bak; \
>
>Property changes on: sysutils/bacula-server/files/patch-src_console_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 193641: 161990 | 162186 | 162194 | 162195 | 162221 | 162222 | 162254