Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=79024674ffa7a65abacaee5bd3bc8dfcda2e5203

commit 79024674ffa7a65abacaee5bd3bc8dfcda2e5203
Author: crazy <[email protected]>
Date:   Thu Feb 1 01:05:44 2018 +0100

llvm-5.0.1-4-x86_64

* trying to workaround:
clang-5.0: error: unknown argument: '-fno-plt'

diff --git a/source/devel/llvm/FrugalBuild b/source/devel/llvm/FrugalBuild
index 55ecec8..ec545f8 100644
--- a/source/devel/llvm/FrugalBuild
+++ b/source/devel/llvm/FrugalBuild
@@ -5,7 +5,7 @@

pkgname=llvm
pkgver=5.0.1
-pkgrel=3
+pkgrel=4
gcc_ver=7.3.0-5
url="http://www.llvm.org";
pkgdesc="Low Level Virtual Machine (Compiler , Tools and Libs)"
@@ -32,13 +32,17 @@ else
source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.xz \
http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz \
http://llvm.org/releases/$pkgver/libcxx-$pkgver.src.tar.xz \
-               http://llvm.org/releases/$pkgver/libcxxabi-$pkgver.src.tar.xz )
+               http://llvm.org/releases/$pkgver/libcxxabi-$pkgver.src.tar.xz \
+               # clang-5.0: error: unknown argument: '-fno-plt'
+               # check whatever 6.x support it .. just compile libclc
+               no-plt.patch)
up2date="Flastarchive $url/releases/download.html .src.tar.xz"
_F_archive_ver="${pkgver}.src"
sha1sums=('43d3659f8a3cef43e7435a3a874b0711f5888052' \
'0cfb79b1fb767c18e167f4bc8836476ca24d9a19' \
'90108818ea614faa92f10d1af0447402efd4de80' \
-          '25ee51e525082ca3f238e0aef5aaf7ab4d55e98d')
+          '25ee51e525082ca3f238e0aef5aaf7ab4d55e98d' \
+          'ca797af24b9e11c251f701422b9e26e222825b43')

fi

@@ -120,8 +124,9 @@ _common_cmake_confopts="    -DCMAKE_INSTALL_PREFIX=/usr \
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=On \
-DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=Off"
Finclude cmake
-
options+=('static')
+_Fbuild_no_patch=yes
+

build() {
if Fuse DEVEL; then
@@ -142,7 +147,7 @@ build() {
Fexec mv -f ../libcxxabi-${_F_archive_ver}/ projects/libcxxabi
fi

-
+       Fexec patch -Np1 -d tools/clang <../no-plt.patch || Fdie
Fcross32_prepare
Fcross32_copy_source

diff --git a/source/devel/llvm/no-plt.patch b/source/devel/llvm/no-plt.patch
new file mode 100644
index 0000000..68507f4
--- /dev/null
+++ b/source/devel/llvm/no-plt.patch
@@ -0,0 +1,36 @@
+From fedcf1d9691bf669d8cd771a032e851d8247aff9 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <[email protected]>
+Date: Thu, 6 Jul 2017 18:53:05 +0300
+Subject: [PATCH 1/2] GCC compatibility: Ignore the -fno-plt flag
+
+---
+ include/clang/Driver/Options.td | 1 +
+ test/Driver/clang_f_opts.c      | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
+index 05dc9d7eb3..c93e6cc08c 100644
+--- a/include/clang/Driver/Options.td
++++ b/include/clang/Driver/Options.td
+@@ -2505,6 +2505,7 @@ defm ivopts : BooleanFFlag<"ivopts">, 
Group<clang_ignored_gcc_optimization_f_Gro
+ defm non_call_exceptions : BooleanFFlag<"non-call-exceptions">, 
Group<clang_ignored_f_Group>;
+ defm peel_loops : BooleanFFlag<"peel-loops">, 
Group<clang_ignored_gcc_optimization_f_Group>;
+ defm permissive : BooleanFFlag<"permissive">, Group<clang_ignored_f_Group>;
++defm plt : BooleanFFlag<"plt">, Group<clang_ignored_f_Group>;
+ defm prefetch_loop_arrays : BooleanFFlag<"prefetch-loop-arrays">, 
Group<clang_ignored_gcc_optimization_f_Group>;
+ defm printf : BooleanFFlag<"printf">, Group<clang_ignored_f_Group>;
+ defm profile : BooleanFFlag<"profile">, Group<clang_ignored_f_Group>;
+diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c
+index c17cec6eba..d9480c915e 100644
+--- a/test/Driver/clang_f_opts.c
++++ b/test/Driver/clang_f_opts.c
+@@ -277,6 +277,7 @@
+ // RUN:     -fno-caller-saves -fcaller-saves                                  
\
+ // RUN:     -fno-reorder-blocks -freorder-blocks                              
\
+ // RUN:     -fno-schedule-insns2 -fschedule-insns2                            
\
++// RUN:     -fno-plt -fplt                                                    
\
+ // RUN:     -fno-stack-check                                                  
\
+ // RUN:     -fno-check-new -fcheck-new                                        
\
+ // RUN:     -ffriend-injection                                                
\
+--
+2.14.1
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to