[arch-commits] Commit in ispc/trunk (Makefile.patch PKGBUILD)

Bruno Pagani archange at archlinux.org
Fri Nov 2 09:25:27 UTC 2018 

    Date: Friday, November 2, 2018 @ 09:25:27
  Author: archange
Revision: 401201

upgpkg: ispc 1.9.2-5

Added:
  ispc/trunk/Makefile.patch
Modified:
  ispc/trunk/PKGBUILD

----------------+
 Makefile.patch |  128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD       |    8 ++-
 2 files changed, 134 insertions(+), 2 deletions(-)

Added: Makefile.patch
===================================================================
--- Makefile.patch	                        (rev 0)
+++ Makefile.patch	2018-11-02 09:25:27 UTC (rev 401201)
@@ -0,0 +1,128 @@
+--- a/Makefile	2017-11-10 15:07:30.000000000 -0800
++++ b/Makefile	2018-03-02 22:43:18.144747339 -0800
+@@ -167,11 +167,11 @@
+ 	$(LLVM_VERSION_DEF) \
+ 	-Wall \
+ 	-DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_VERSION="\"$(BUILD_VERSION)\"" \
+-	-Wno-sign-compare -Wno-unused-function $(WERROR)
++	-Wno-sign-compare -Wno-unused-function
+ 
+ # if( !($(LLVM_VERSION) == LLVM_3_2 || $(LLVM_VERSION) == LLVM_3_3 || $(LLVM_VERSION) == LLVM_3_4))
+ ifeq (,$(filter $(LLVM_VERSION), LLVM_3_2 LLVM_3_3 LLVM_3_4))
+-	CXXFLAGS+=-std=c++11 -Wno-c99-extensions -Wno-deprecated-register -fno-rtti
++	CXXFLAGS+=-std=c++11 -fno-rtti
+ endif
+ ifneq ($(ARM_ENABLED), 0)
+     CXXFLAGS+=-DISPC_ARM_ENABLED
+@@ -233,7 +233,7 @@
+ 
+ depend: llvm_check $(CXX_SRC) $(HEADERS)
+ 	@echo Updating dependencies
+-	@$(CXX) -MM $(CXXFLAGS) $(CXX_SRC) | sed 's_^\([a-z]\)_objs/\1_g' > depend
++	$(CXX) -MM $(CXXFLAGS) $(CXX_SRC) | sed 's_^\([a-z]\)_objs/\1_g' > depend
+ 
+ -include depend
+ 
+@@ -263,7 +263,7 @@
+ 
+ ispc: print_llvm_src dirs $(OBJS)
+ 	@echo Creating ispc executable
+-	@$(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS)
++	$(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS)
+ 
+ # Use clang as a default compiler, instead of gcc
+ # This is default now.
+@@ -285,19 +285,19 @@
+ 
+ objs/%.o: %.cpp
+ 	@echo Compiling $<
+-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
++	$(CXX) $(CXXFLAGS) -o $@ -c $<
+ 
+ objs/cbackend.o: cbackend.cpp
+ 	@echo Compiling $<
+-	@$(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $<
++	$(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $<
+ 
+ objs/opt.o: opt.cpp
+ 	@echo Compiling $<
+-	@$(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $<
++	$(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $<
+ 
+ objs/%.o: objs/%.cpp
+ 	@echo Compiling $<
+-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
++	$(CXX) $(CXXFLAGS) -o $@ -c $<
+ 
+ objs/parse.cc: parse.yy
+ 	@echo Running bison on $<
+@@ -305,7 +305,7 @@
+ 
+ objs/parse.o: objs/parse.cc $(HEADERS)
+ 	@echo Compiling $<
+-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
++	$(CXX) $(CXXFLAGS) -o $@ -c $<
+ 
+ objs/lex.cpp: lex.ll 
+ 	@echo Running flex on $<
+@@ -313,49 +313,49 @@
+ 
+ objs/lex.o: objs/lex.cpp $(HEADERS) objs/parse.cc
+ 	@echo Compiling $<
+-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
++	$(CXX) $(CXXFLAGS) -o $@ -c $<
+ 
+ objs/builtins-dispatch.cpp: builtins/dispatch.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
+ 	@echo Creating C++ source from builtins definition file $<
+-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | python bitcode2cpp.py $< > $@
++	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | python bitcode2cpp.py $< > $@
+ 
+ objs/builtins-%-32bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
+ 	@echo Creating C++ source from builtins definition file $< \(32 bit version\)
+-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | python bitcode2cpp.py $< 32bit > $@
++	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | python bitcode2cpp.py $< 32bit > $@
+ 
+ objs/builtins-%-64bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
+ 	@echo Creating C++ source from builtins definition file $< \(64 bit version\)
+-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | python bitcode2cpp.py $< 64bit > $@
++	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | python bitcode2cpp.py $< 64bit > $@
+ 
+ objs/builtins-c-32.cpp: builtins/builtins.c
+ 	@echo Creating C++ source from builtins definition file $<
+-	@$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 32 > $@
++	$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 32 > $@
+ 
+ objs/builtins-c-64.cpp: builtins/builtins.c
+ 	@echo Creating C++ source from builtins definition file $<
+-	@$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 64 > $@
++	$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 64 > $@
+ 
+ objs/stdlib_mask1_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask1
+-	@$(CLANG) -E -x c -DISPC_MASK_BITS=1 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
++	$(CLANG) -E -x c -DISPC_MASK_BITS=1 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+ 		python stdlib2cpp.py mask1 > $@
+ 
+ objs/stdlib_mask8_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask8
+-	@$(CLANG) -E -x c -DISPC_MASK_BITS=8 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
++	$(CLANG) -E -x c -DISPC_MASK_BITS=8 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+ 		python stdlib2cpp.py mask8 > $@
+ 
+ objs/stdlib_mask16_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask16
+-	@$(CLANG) -E -x c -DISPC_MASK_BITS=16 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
++	$(CLANG) -E -x c -DISPC_MASK_BITS=16 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+ 		python stdlib2cpp.py mask16 > $@
+ 
+ objs/stdlib_mask32_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask32
+-	@$(CLANG) -E -x c -DISPC_MASK_BITS=32 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
++	$(CLANG) -E -x c -DISPC_MASK_BITS=32 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+ 		python stdlib2cpp.py mask32 > $@
+ 
+ objs/stdlib_mask64_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask64
+-	@$(CLANG) -E -x c -DISPC_MASK_BITS=64 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
++	$(CLANG) -E -x c -DISPC_MASK_BITS=64 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+ 		python stdlib2cpp.py mask64 > $@

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-02 09:00:55 UTC (rev 401200)
+++ PKGBUILD	2018-11-02 09:25:27 UTC (rev 401201)
@@ -3,7 +3,7 @@
 
 pkgname=ispc
 pkgver=1.9.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A compiler for high-performance SIMD programming on the CPU"
 arch=('x86_64')
 url="https://ispc.github.io/"
@@ -12,6 +12,7 @@
 makedepends=('llvm' 'python' 'lib32-glibc')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/ispc/ispc/archive/v${pkgver}.tar.gz"
         '0001-Remove-uses-of-LLVM-dump-functions.patch' # Borrowed from Fedora
+        'Makefile.patch' # Borrowed from Fedora
         LLVM6-1.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1307.patch"
         LLVM6-2.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1315.patch"
         LLVM7-1.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1312.patch"
@@ -20,6 +21,7 @@
         LLVM7-4.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1330.patch")
 sha256sums=('76a14e22f05a52fb0b30142686a6cb144b0415b39be6c9fcd3f17ac23447f0b2'
             'aed52cba60197bd20b2aef12e93e2e640d3ef2596bf154fe4a6e0980cfe78cca'
+            '95fbfd84e0da1fca3fabbfbcab597a7756599ddc1539ac98e49b6e269f5bc538'
             'e0846b0b7793bec1522a87696330bfdbd5c6b976d2f77389f5fe93c9de92386d'
             '205468666cf985dd0634103c00a727e942ab330bddd2520f0d89e98e662cc495'
             'ac02472507690def70643b96d01bf70a6dfab7e465351c6f4588696679f5fb61'
@@ -30,6 +32,7 @@
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i ../0001-Remove-uses-of-LLVM-dump-functions.patch
+  patch -p1 -i ../Makefile.patch
   patch -p1 -i ../LLVM6-1.patch
   patch -p1 -i ../LLVM6-2.patch
   patch -p1 -i ../LLVM7-1.patch
@@ -40,7 +43,8 @@
 
 build() {
   cd ${pkgname}-${pkgver}
-  make
+  # FS#60340
+  make gcc
 }
 
 package() {

More information about the arch-commits mailing list