added stuff to MACOS to add support for /opt/local and /opt/homebrew …

…for building.
simsong · Apr 26, 2024 · 37e0141 · 37e0141
1 parent 972d746
commit 37e0141
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/continuous-integration-pip.yml b/.github/workflows/continuous-integration-pip.yml
@@ -71,10 +71,6 @@ jobs:
           gcc --version
           g++ --version
 
-      - name: setenv
-        run: |
-          export ENV_TEST_ONE=1
-
       - name: printenv
         run: |
           printenv

diff --git a/etc/CONFIGURE_MACOS.bash b/etc/CONFIGURE_MACOS.bash
@@ -29,8 +29,17 @@ PKGS+="wget libtool autoconf automake libtool libxml2 libewf json-c re2 abseil p
 
 $WHICH install $PKGS || (echo installation install failed; exit 1)
 
-# Validate installation
-ls -l /opt/homebrew/lib/pkgconfig
-echo == re2 ==
-cat /opt/homebrew/lib/pkgconfig/re2.pc
+echo ================
+echo Updating .profile
+cat >> $HOME/.profile <<
+for PREFIX in /opt/local /opt/homebrew ; do
+    if [ -x $PREFIX/include ]; then
+        export CPPFLAGS="-I$PREFIX/include/ $CPPFLAGS"
+    fi
+    if [ -x $PREFIX/lib ]; then
+        export LDFLAGS="-L$PREFIX/lib/ $LDFLAGS"
+    fi
+done
+EOF
+
 exit 0