Patches to FreeBSD monotone and boost ports

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Patches to FreeBSD monotone and boost ports

Václav Haisman
Hi,
the two attached patches allow me to build Boost and monotone with GCC
3.4 on FreeBSD 4.x. I hope somebody besides me will find them useful.

Vaclav Haisman

--- Makefile.orig Tue Mar 22 18:02:38 2005
+++ /usr/ports/devel/boost/Makefile Tue Oct 25 22:17:19 2005
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:bo
 MAINTAINER= [hidden email]
 COMMENT= Free peer-reviewed portable C++ source libraries
 
+USE_ZIP= yes
 USE_BZIP2= yes
 USE_REINPLACE= yes
 INSTALLS_SHLIB= yes
@@ -28,7 +29,8 @@ MAKE_ENV+= GCC="${CC} ${CFLAGS}"\
 OPTIONS= VERBOSE_BUILD "Show compiler messages" off \
  DEBUG "Build debugging symbols" off \
  THREADS "Thread support" on  \
- OPTIMIZED_CFLAGS "Enable -O3 optimization" off
+ OPTIMIZED_CFLAGS "Enable -O3 optimization" off \
+ GCC34 "Use GCC 3.4 (for FreeBSD 4.x only)" off
 
 UNIQ= /usr/bin/uniq
 BOOST_LIBS= date_time filesystem prg_exec_monitor program_options \
@@ -37,6 +39,8 @@ BOOST_SHARED_LIB_VER= 2
 
 PKGMESSAGE= ${WRKDIR}/pkg-message
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITH_PYTHON) && defined(WITH_PYSTE)
 WITH_PYTHON= IMPLIED_BY_PYSTE
 .endif
@@ -74,31 +78,40 @@ PLIST_SUB+= BOOST_PYTHON="@comment "
 PLIST_SUB+= BOOST_PYSTE="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
 SPIRIT_VERSION= 1.6.2
 
 # FreeBSD 4:
 # - no wchar support
-# - needs stlport
+# - needs stlport or GCC 3.4
 # - spirit 1.6.x
 .if ${OSVERSION} < 500000
-USE_ZIP= yes
+.if defined(WITH_GCC34)
+USE_GCC=3.4
+.endif
+
 EXTRA_PATCHES= ${FILESDIR}/FBSD4-patch-libs::serialization::build::Jamfile\
  ${FILESDIR}/FBSD4-patch-boost::program_options::detail::utf8_codecvt_facet.hpp
 
 DISTFILES+= spirit-only-${SPIRIT_VERSION}.zip:spirit_site
 MASTER_SITE_SUBDIR+=spirit/:spirit_site
+.if !defined(WITH_GCC34)
 BJAM_BUILD+= <stlport-iostream>on
 BOOST_TOOLS= gcc-stlport
+.else
+BOOST_TOOLS= gcc
+.endif
 
 PLIST_SUB+= BOOST_WCHAR="@comment "\
  BOOST_SPIRIT_1.6=""\
  BOOST_SPIRIT_1.8="@comment "
 
+.if !defined(WITH_GCC34)
 BOOST_STL_OPTS= "-sSTLPORT_INCLUDE_DIRECTORY=${LOCALBASE}/include/stlport"\
  "-sSTLPORT_LIB_DIRECTORY=${LOCALBASE}/lib"
-
 RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+.else
+RUN_DEPENDS+= ${LOCALBASE}/bin/gcc34:${PORTSDIR}/lang/gcc34
+.endif
 BUILD_DEPENDS+= ${RUN_DEPENDS}
 
 # FreeBSD 5
@@ -302,7 +315,7 @@ do-install:
 post-install:
  @${TOUCH} ${PKGMESSAGE}
 
-.if ${OSVERSION} < 500000
+.if ${OSVERSION} < 500000 && !defined(WITH_GCC34)
  @${CAT} ${.CURDIR}/../boost/pkg-message.stlport >> ${PKGMESSAGE}
  @${ECHO_CMD} >> ${PKGMESSAGE}
 .endif

--- Makefile.orig Fri Oct 21 05:00:47 2005
+++ /usr/ports/devel/monotone/Makefile Tue Oct 25 22:50:51 2005
@@ -25,6 +25,11 @@ USE_GETTEXT= yes
 .endif
 USE_GMAKE= yes
 
+OPTIONS= NLS "With NLS." off \
+ LUA_PORT "With LUA port." off \
+ SQLITE_PORT "With SQLlite port." off \
+ GCC34 "Use GCC 3.4 (FreeBSD 4.x only)." off
+
 GNU_CONFIGURE= yes
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -32,6 +37,8 @@ PLIST_FILES= bin/monotone
 INFO= monotone
 MAN1= monotone.1
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+= --disable-nls
 .else
@@ -47,10 +54,10 @@ LIB_DEPENDS+= sqlite3:${PORTSDIR}/databa
 CONFIGURE_ARGS+= --with-bundled-sqlite=no
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN= "Does not compile on FreeBSD 4.x"
+.if ${OSVERSION} < 500000 && !defined(WITH_GCC34)
+BROKEN= "Does not compile on FreeBSD 4.x without WITH_GCC34 defined."
+.else
+USE_GCC=3.4
 .endif
 
 post-patch:

_______________________________________________
Monotone-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/monotone-devel

signature.asc (558 bytes) Download Attachment