Fix building crypto++.

1 files changed, 4 insertions, 6 deletions

diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index 198137f1f..aefbae61b 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -27,15 +27,13 @@ md5sums=('96cbeba0907562b077e26bcffb483828'
 build() {
   cd ${srcdir}
 
-#  cp "${srcdir}/GNUmakefile.parabola" GNUmakefile
-#  make -f GNUmakefile
-
   # Fix gcc 4.7 build
   patch -Np1 -i "${srcdir}/gcc4.7.patch"
 
-  sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-  export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
-  make -f GNUmakefile  
+  # The upstream build system expects this file to be modified
+  # to e.g. use system CFLAGS or use features of modern linkers.
+  cp "${srcdir}/GNUmakefile.parabola" GNUmakefile
+  make -f GNUmakefile
   make libcryptopp.so
 }