Date: Sun, 15 Jan 2006 12:41:33 GMT From: Matthias Sund <m.sund@arcor.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/91826: update port: devel/codeblocks, build fix on i386 4 machines Message-ID: <200601151241.k0FCfXm7082505@www.freebsd.org> Resent-Message-ID: <200601151250.k0FCo5Ph092439@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 91826
>Category: ports
>Synopsis: update port: devel/codeblocks, build fix on i386 4 machines
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 15 12:50:02 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Matthias Sund
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
FreeBSD travelmate 6.0-STABLE FreeBSD 6.0-STABLE #7: Sun Jan 15 12:32:02 CET 2006 masu@travelmate:/usr/obj/usr/src/sys/TRAVELMATE i386
>Description:
This update hopefully fixes build problem on i386 4 machines.
Added GCC dependency in order to use -MF and -MT command line parameters.
Variables ${CC} and ${CXX} (defined in bsd.gcc.mk) are now being used to define gcc commands.
Replaced all ${ECHO} variables with ${ECHO_CMD} in Makefile.
>How-To-Repeat:
>Fix:
diff -ruN codeblocks_orig/Makefile codeblocks/Makefile
--- codeblocks_orig/Makefile Sun Jan 15 12:54:11 2006
+++ codeblocks/Makefile Sun Jan 15 12:27:02 2006
@@ -21,11 +21,21 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/src
+USE_GCC= 3.2+
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
+TARGETS= tinyXML scintilla sdk wxDockit src console_runner doc
+PLUGINS= Astyle CompilerGCC DebuggerGDB CodeCompletion ClassWizard DefMimeHandler PluginsWizard ToDo XPManifest
+EXTENSIONS= CC CPP LD LIB
+
+GCC= ${CC}
+CPP= ${CXX}
+LD= ${CXX}
+LIB= ar
+
post-extract:
@${FIND} -E ${WRKSRC} -type f -iregex \
".*\.(c|h|cpp|am|in|doxy|cbp|template|xrc|html)" -print0 | \
@@ -39,6 +49,17 @@
pre-build:
@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+.for t in ${TARGETS}
+. for e in ${EXTENSIONS}
+ @${ECHO_CMD} "${t}_${e}=${${e}}" >> ${WRKSRC}/gcc.defs
+. endfor
+.endfor
+.for p in ${PLUGINS}
+. for e in ${EXTENSIONS}
+ @${ECHO_CMD} "plugin_${p}_${e}=${${e}}" >> ${WRKSRC}/gcc.defs
+. endfor
+.endfor
+
post-build:
@(${FIND} -E ${WRKSRC} -type f -iregex ".*\.(orig|bak)" -exec ${RM} {} \;)
@${CHMOD} +x ${WRKSRC}/update.sh
@@ -56,16 +77,16 @@
@(cd ${WRKSRC}/output && ${FIND} share \! -name "*.so" -type f -exec ${CP} {} ${PREFIX}/{} \;)
post-install:
- @${ECHO} bin/${PORTNAME} >> ${TMPPLIST}
- @${ECHO} bin/console_runner >> ${TMPPLIST}
- @${ECHO} lib/libcodeblocks.so >> ${TMPPLIST}
- @${ECHO} lib/libwxscintilla.so >> ${TMPPLIST}
- @(cd ${WRKSRC}/output && ${FIND} share -type f -exec ${ECHO} {} >> ${TMPPLIST} \;)
- @${ECHO} @dirrm share/${PORTNAME}/images/codecompletion >> ${TMPPLIST}
- @${ECHO} @dirrm share/${PORTNAME}/images >> ${TMPPLIST}
- @${ECHO} @dirrm share/${PORTNAME}/lexers >> ${TMPPLIST}
- @${ECHO} @dirrm share/${PORTNAME}/plugins >> ${TMPPLIST}
- @${ECHO} @dirrm share/${PORTNAME}/templates >> ${TMPPLIST}
- @${ECHO} @dirrm share/${PORTNAME} >> ${TMPPLIST}
+ @${ECHO_CMD} bin/${PORTNAME} >> ${TMPPLIST}
+ @${ECHO_CMD} bin/console_runner >> ${TMPPLIST}
+ @${ECHO_CMD} lib/libcodeblocks.so >> ${TMPPLIST}
+ @${ECHO_CMD} lib/libwxscintilla.so >> ${TMPPLIST}
+ @(cd ${WRKSRC}/output && ${FIND} share -type f -exec ${ECHO_CMD} {} >> ${TMPPLIST} \;)
+ @${ECHO_CMD} @dirrm share/${PORTNAME}/images/codecompletion >> ${TMPPLIST}
+ @${ECHO_CMD} @dirrm share/${PORTNAME}/images >> ${TMPPLIST}
+ @${ECHO_CMD} @dirrm share/${PORTNAME}/lexers >> ${TMPPLIST}
+ @${ECHO_CMD} @dirrm share/${PORTNAME}/plugins >> ${TMPPLIST}
+ @${ECHO_CMD} @dirrm share/${PORTNAME}/templates >> ${TMPPLIST}
+ @${ECHO_CMD} @dirrm share/${PORTNAME} >> ${TMPPLIST}
.include <bsd.port.mk>
diff -ruN codeblocks_orig/files/Makefile codeblocks/files/Makefile
--- codeblocks_orig/files/Makefile Sun Jan 15 12:54:11 2006
+++ codeblocks/files/Makefile Sat Jan 14 23:54:32 2006
@@ -7,88 +7,11 @@
# Project filename: /home/masu/ports/codeblocks/work/codeblocks-1.0rc2/src/CodeBlocks-unix.cbp
# Compiler used: GNU GCC Compiler
+### include compiler definitions
+include ./gcc.defs
+
### Variables used in this Makefile
LIB_WXXRC=wx_gtk2_xrc-2.6
-tinyXML_CC=gcc
-tinyXML_CPP=g++
-tinyXML_LD=g++
-tinyXML_LIB=ar
-tinyXML_RESCOMP=
-scintilla_CC=gcc
-scintilla_CPP=g++
-scintilla_LD=g++
-scintilla_LIB=ar
-scintilla_RESCOMP=
-sdk_CC=gcc
-sdk_CPP=g++
-sdk_LD=g++
-sdk_LIB=ar
-sdk_RESCOMP=
-wxDockit_CC=gcc
-wxDockit_CPP=g++
-wxDockit_LD=g++
-wxDockit_LIB=ar
-wxDockit_RESCOMP=
-src_CC=gcc
-src_CPP=g++
-src_LD=g++
-src_LIB=ar
-src_RESCOMP=
-plugin_Astyle_CC=gcc
-plugin_Astyle_CPP=g++
-plugin_Astyle_LD=g++
-plugin_Astyle_LIB=ar
-plugin_Astyle_RESCOMP=
-plugin_CompilerGCC_CC=gcc
-plugin_CompilerGCC_CPP=g++
-plugin_CompilerGCC_LD=g++
-plugin_CompilerGCC_LIB=ar
-plugin_CompilerGCC_RESCOMP=
-plugin_DebuggerGDB_CC=gcc
-plugin_DebuggerGDB_CPP=g++
-plugin_DebuggerGDB_LD=g++
-plugin_DebuggerGDB_LIB=ar
-plugin_DebuggerGDB_RESCOMP=
-plugin_CodeCompletion_CC=gcc
-plugin_CodeCompletion_CPP=g++
-plugin_CodeCompletion_LD=g++
-plugin_CodeCompletion_LIB=ar
-plugin_CodeCompletion_RESCOMP=
-plugin_ClassWizard_CC=gcc
-plugin_ClassWizard_CPP=g++
-plugin_ClassWizard_LD=g++
-plugin_ClassWizard_LIB=ar
-plugin_ClassWizard_RESCOMP=
-plugin_DefMimeHandler_CC=gcc
-plugin_DefMimeHandler_CPP=g++
-plugin_DefMimeHandler_LD=g++
-plugin_DefMimeHandler_LIB=ar
-plugin_DefMimeHandler_RESCOMP=
-plugin_PluginsWizard_CC=gcc
-plugin_PluginsWizard_CPP=g++
-plugin_PluginsWizard_LD=g++
-plugin_PluginsWizard_LIB=ar
-plugin_PluginsWizard_RESCOMP=
-plugin_ToDo_CC=gcc
-plugin_ToDo_CPP=g++
-plugin_ToDo_LD=g++
-plugin_ToDo_LIB=ar
-plugin_ToDo_RESCOMP=
-plugin_XPManifest_CC=gcc
-plugin_XPManifest_CPP=g++
-plugin_XPManifest_LD=g++
-plugin_XPManifest_LIB=ar
-plugin_XPManifest_RESCOMP=
-console_runner_CC=gcc
-console_runner_CPP=g++
-console_runner_LD=g++
-console_runner_LIB=ar
-console_runner_RESCOMP=
-doc_CC=gcc
-doc_CPP=g++
-doc_LD=g++
-doc_LIB=ar
-doc_RESCOMP=
### Compiler/linker options
tinyXML_GLOBAL_CFLAGS=
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601151241.k0FCfXm7082505>