🚧 Update C++ compiler flags for MUSL C

sgerrand · Jul 14, 2016 · d4cdaef · d4cdaef
1 parent 780bbcc
commit d4cdaef
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/20-add-aix-to-r-extra-cpp-flags.patch b/20-add-aix-to-r-extra-cpp-flags.patch
@@ -0,0 +1,11 @@
+--- src/R-3.2.3/etc/Makeconf.in
++++ src/R-3.2.3/etc/Makeconf.in
+@@ -114,7 +114,7 @@
+ STATIC_LIBR = @WANT_R_STATIC_TRUE@ @STATICR1@ "$(R_HOME)/lib$(R_ARCH)/libR.a" @STATICR2@ $(BLAS_LIBS) $(FLIBS) @R_XTRA_LIBS@ $(LIBINTL) @READLINE_LIBS@ $(LIBS)
+
+ R_XTRA_CFLAGS = @R_XTRA_CFLAGS@
+-R_XTRA_CPPFLAGS = @R_XTRA_CPPFLAGS@ @R_XTRA_CPPFLAGS2@ -DNDEBUG
++R_XTRA_CPPFLAGS = @R_XTRA_CPPFLAGS@ @R_XTRA_CPPFLAGS2@ -DNDEBUG -D_AIX
+ R_XTRA_CXXFLAGS = @R_XTRA_CXXFLAGS@
+ R_XTRA_FFLAGS = @R_XTRA_FFLAGS@
+
diff --git a/APKBUILD b/APKBUILD
@@ -13,7 +13,8 @@ makedepends="$depends_dev autoconf automake gfortran"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://cran.rstudio.com/src/base/$pkgname-${pkgver:0:1}/$pkgname-$pkgver.tar.gz
-        10-glibc-disable-stack-end.patch"
+        10-glibc-disable-stack-end.patch
+        20-add-aix-to-r-extra-cpp-flags.patch"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 
@@ -62,8 +63,11 @@ doc() {
 }
 
 md5sums="5a7506c8813432d1621c9725e86baf7a  R-3.3.0.tar.gz
-4368a6983cf584d666c51aa61d680209  10-glibc-disable-stack-end.patch"
+4368a6983cf584d666c51aa61d680209  10-glibc-disable-stack-end.patch
+d7796bd9163b5c170eef82db94ff7e3b  20-add-aix-to-r-extra-cpp-flags.patch"
 sha256sums="9256b154b1a5993d844bee7b1955cd49c99ad72cef03cce3cd1bdca1310311e4  R-3.3.0.tar.gz
-26a00af590550a19d6a2c3e21ce932de6722300d1dd18729bdfa16b57da23242  10-glibc-disable-stack-end.patch"
+26a00af590550a19d6a2c3e21ce932de6722300d1dd18729bdfa16b57da23242  10-glibc-disable-stack-end.patch
+6ac8cad03856407e0f036fa419b9a1e5fa5ec549c9bd25180fb6425ca1e9b799  20-add-aix-to-r-extra-cpp-flags.patch"
 sha512sums="81e9ef761bee4d9322ca785fbed843ab13c2f5b55be769d982a81a7e7694e03980cbc7ee067fc850bd7a17ab65d93be81f27db50d428665773174c690383d4cc  R-3.3.0.tar.gz
-a1b3d9ad70dc77a649f0b56e1080e2f833e7eba23408ee710d372bfde06eb651418c78f640554743666c812eb0d268e0db48b2cbf038481c9ede46e4d4f43c3e  10-glibc-disable-stack-end.patch"
+a1b3d9ad70dc77a649f0b56e1080e2f833e7eba23408ee710d372bfde06eb651418c78f640554743666c812eb0d268e0db48b2cbf038481c9ede46e4d4f43c3e  10-glibc-disable-stack-end.patch
+e422ac15b558de684ec3357f71ff5c6a488bee97de6c19b3f6efa230015716e05d4e07ed5b0add411ed16be53c9d019cdc7174f1c997e8ab11af98e6246439dd  20-add-aix-to-r-extra-cpp-flags.patch"