pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Make this compile on arch i386 with -march=i586 to use compare-and-swap on time_t (cmpxchg8b).



Module Name:	pkgsrc-wip
Committed By:	Frank Kardel <kardel%netbsd.org@localhost>
Pushed By:	kardel
Date:		Fri Jun 26 09:54:18 2020 +0200
Changeset:	8cca3c01a5d56182bc978a297deb8c3c2f582c0d

Modified Files:
	bareos/Makefile.common

Log Message:
Make this compile on arch i386 with -march=i586 to use
compare-and-swap on time_t (cmpxchg8b).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8cca3c01a5d56182bc978a297deb8c3c2f582c0d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bareos/Makefile.common | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diffs:
diff --git a/bareos/Makefile.common b/bareos/Makefile.common
index f27bfce107..b8ef6fd1cc 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -25,6 +25,10 @@ USE_CMAKE=	yes
 USE_LANGUAGES=  c c++
 CMAKE_ARG_PATH= ..
 CONFIGURE_DIRS= core/_build
+# needs to be able to do compare-and-swap on time_t (cmpxchg8b)
+.if ${MACHINE_ARCH} == "i386"
+CXXFLAGS+=                -march=i586
+.endif
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/core/_build
@@ -69,7 +73,9 @@ FILES_SUBST+=		BAREOS_SD_USER=${BAREOS_SD_USER}
 # cmake arguments
 CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${PREFIX}
 CMAKE_ARGS+=	-DCMAKE_STAGING_PREFIX=${BUILDLINK_DIR}
-# reduce job log noise: CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS=-DNO_ADV=1
+# reduce job log noise: CXXFLAGS+=-DNO_ADV=1
+CXXFLAGS+=-DNO_ADV=1
+CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 CMAKE_ARGS+=	-DSKIP_GTEST=1
 CMAKE_ARGS+=	-Dconfigtemplatedir=${PREFIX}/${CONFIG_TEMPLATE_PATH}
 CMAKE_ARGS+=	-Dworkingdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working


Home | Main Index | Thread Index | Old Index