From 6976ea69f4b376c6fc9319f6ad0bc39a2bba04df Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Mon, 30 May 2022 21:00:11 -0700
Subject: [PATCH] MAINT Update side modules to use SIDE_MODULE_LDFLAGS (#2650)

It causes trouble when these flags get out of sync, cf
WASM_BIGINT branch #2643
---
 packages/CLAPACK/meta.yaml             | 2 +-
 packages/cpp-exceptions-test/meta.yaml | 8 ++++----
 packages/openssl/meta.yaml             | 6 +++---
 packages/sharedlib-test/meta.yaml      | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/CLAPACK/meta.yaml b/packages/CLAPACK/meta.yaml
index 0ef2817a2..9118b7c74 100644
--- a/packages/CLAPACK/meta.yaml
+++ b/packages/CLAPACK/meta.yaml
@@ -34,6 +34,6 @@ build:
 
     emmake make -j ${PYODIDE_JOBS:-3} blaslib lapacklib
     mkdir -p dist/lib
-    emcc blas_WA.a lapack_WA.a F2CLIBS/libf2c.a -sSIDE_MODULE -o dist/lib/clapack_all.so
+    emcc blas_WA.a lapack_WA.a F2CLIBS/libf2c.a ${SIDE_MODULE_LDFLAGS} -o dist/lib/clapack_all.so
     mkdir -p ${WASM_LIBRARY_DIR}/CLAPACK
     cp -r INCLUDE ${WASM_LIBRARY_DIR}/CLAPACK/
diff --git a/packages/cpp-exceptions-test/meta.yaml b/packages/cpp-exceptions-test/meta.yaml
index b2035ce1c..f27b52375 100644
--- a/packages/cpp-exceptions-test/meta.yaml
+++ b/packages/cpp-exceptions-test/meta.yaml
@@ -7,8 +7,8 @@ source:
 build:
   sharedlibrary: true
   script: |
-    em++ -c throw.cpp -o throw.o -fPIC -fexceptions -O2
-    em++ -c catch.cpp -o catch.o -fPIC -fexceptions -O2
+    em++ -c throw.cpp -o throw.o ${SIDE_MODULE_CFLAGS} -fexceptions
+    em++ -c catch.cpp -o catch.o ${SIDE_MODULE_CFLAGS} -fexceptions
     mkdir dist
-    em++ throw.o -sSIDE_MODULE -o dist/cpp-exceptions-test-throw.so -fexceptions
-    em++ catch.o -sSIDE_MODULE -o dist/cpp-exceptions-test-catch.so -fexceptions
+    em++ throw.o ${SIDE_MODULE_LDFLAGS} -o dist/cpp-exceptions-test-throw.so -fexceptions
+    em++ catch.o ${SIDE_MODULE_LDFLAGS} -o dist/cpp-exceptions-test-catch.so -fexceptions
diff --git a/packages/openssl/meta.yaml b/packages/openssl/meta.yaml
index 5c4dac376..1e5b4a729 100644
--- a/packages/openssl/meta.yaml
+++ b/packages/openssl/meta.yaml
@@ -15,7 +15,7 @@ build:
       -DHAVE_FORK=0 \
       -DOPENSSL_NO_SECURE_MEMORY \
       -DNO_SYSLOG \
-      -fPIC \
+      ${SIDE_MODULE_CFLAGS} \
       --prefix=${WASM_LIBRARY_DIR}
 
     sed -i 's!^CROSS_COMPILE=.*!!g' Makefile
@@ -24,6 +24,6 @@ build:
     make -j ${PYODIDE_JOBS:-3} libssl.a
     emar -d libcrypto.a liblegacy-lib-bn_asm.o liblegacy-lib-des_enc.o liblegacy-lib-fcrypt_b.o
     mkdir dist
-    emcc -sSIDE_MODULE=1 libcrypto.a -o libcrypto.so
-    emcc -sSIDE_MODULE=1 libssl.a -o libssl.so
+    emcc ${SIDE_MODULE_LDFLAGS} libcrypto.a -o libcrypto.so
+    emcc ${SIDE_MODULE_LDFLAGS} libssl.a -o libssl.so
     make install_sw
diff --git a/packages/sharedlib-test/meta.yaml b/packages/sharedlib-test/meta.yaml
index 8af287cc9..f115c9b36 100644
--- a/packages/sharedlib-test/meta.yaml
+++ b/packages/sharedlib-test/meta.yaml
@@ -9,6 +9,6 @@ source:
 build:
   sharedlibrary: true
   script: |
-    emcc -c main.c -o main.o -fPIC
+    emcc -c main.c -o main.o ${SIDE_MODULE_CFLAGS}
     mkdir dist
-    emcc main.o -sSIDE_MODULE -o dist/sharedlib-test.so
+    emcc main.o ${SIDE_MODULE_LDFLAGS} -o dist/sharedlib-test.so