pkgsrc-WIP-changes archive

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

llvm-git: Sync Makefile with lang/llvm/Makefile



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri May 5 23:11:32 2017 +0200
Changeset:	8a24b9b1baa69511667329a3853f9b1dc56bc48d

Modified Files:
	llvm-git/Makefile

Log Message:
llvm-git: Sync Makefile with lang/llvm/Makefile

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

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

diffstat:
 llvm-git/Makefile | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diffs:
diff --git a/llvm-git/Makefile b/llvm-git/Makefile
index a9e2dcd689..7b1f0e3bd4 100644
--- a/llvm-git/Makefile
+++ b/llvm-git/Makefile
@@ -23,13 +23,19 @@ CMAKE_ARG_PATH=		${WRKSRC}
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_ARGS+=	-DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_ARGS+=	-DLLVM_BUILD_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DLLVM_INSTALL_UTILS=ON
+CMAKE_ARGS+=	-DLLVM_LINK_LLVM_DYLIB=ON
+
+CMAKE_ARGS.Darwin+=	-DCMAKE_LIBTOOL=/usr/bin/libtool
 
 CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
 
 # XXX perl is not added as a tool as it does not seem to be required
 REPLACE_PERL+=		utils/*.pl
 REPLACE_PERL+=		utils/codegen-diff
+REPLACE_PERL+=		utils/llvm-native-gxx
 
 REPLACE_PYTHON+=	*.py
 REPLACE_PYTHON+=	*/*.py
@@ -48,23 +54,27 @@ REPLACE_PYTHON+=	utils/llvm-lit/llvm-lit.in
 TEST_TARGET=		check
 TEST_ENV+=		LD_LIBRARY_PATH=${WRKDIR}/build/lib
 
+# It may be that the Solaris linker is more strict here and they can be removed on
+# all platforms.  Change this to a patch if verified.
+SUBST_CLASSES.SunOS+=	lto
+SUBST_STAGE.lto=	pre-configure
+SUBST_FILES.lto=	tools/lto/lto.exports
+SUBST_SED.lto=		-e '/^LLVM/d'
+
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=	notdylib
 .if ${_OPSYS_SHLIB_TYPE} == "dylib"
 SOEXT=		dylib
 .else
 SOEXT=		so
+PLIST.notdylib=	yes
 .endif
 PLIST_SUBST+=	SOEXT=${SOEXT}
 
-.if ${OPSYS} == "Darwin"
-.PHONY: fix-darwin-install-name
-post-install: fix-darwin-install-name
-fix-darwin-install-name:
-.  for lib in BugpointPasses LLVMHello libLTO
-	install_name_tool -id ${PREFIX}/lib/${lib}.${SOEXT}	\
-		${DESTDIR}${PREFIX}/lib/${lib}.${SOEXT}
-.  endfor
+# needs std::atomic with 64-bit CAS
+.if ${MACHINE_ARCH} == "i386"
+CXXFLAGS+=	-march=i586
 .endif
 
 .include "options.mk"


Home | Main Index | Thread Index | Old Index