add sudo on OSX on missing files

gem · Nov 16, 2023 · bc1bf9a · bc1bf9a
1 parent 7d10dc2
commit bc1bf9a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/config.sh b/config.sh
@@ -57,8 +57,9 @@ function build_geos {
         -DBUILD_APPS:BOOL=OFF \
         -DBUILD_TESTING:BOOL=OFF \
         && $cmake --build . -j4 \
-        && sudo $cmake --install .)
+        && if [ -n "$IS_OSX" ]; then sudo make install; else make install; fi)
     touch geos-stamp
+        #&& sudo $cmake --install .)
 }
 
 function build_jsonc {

diff --git a/multibuild/library_builders.sh b/multibuild/library_builders.sh
@@ -67,9 +67,9 @@ function build_simple {
     local name_version="${name}-${version}"
     local archive=${name_version}.${ext}
     fetch_unpack $url/$archive
-    cd $name_version 
+    cd $name_version
     ./configure --prefix=$BUILD_PREFIX $configure_args \
-    make -j4 
+    make -j4
     # && sudo make install)
 	if [ -n "$IS_OSX" ]; then sudo make install; else make install; fi
     touch "${name}-stamp"
@@ -156,10 +156,10 @@ function build_new_zlib {
 function build_jpeg {
     if [ -e jpeg-stamp ]; then return; fi
     fetch_unpack http://ijg.org/files/jpegsrc.v${JPEG_VERSION}.tar.gz
-    cd jpeg-${JPEG_VERSION}
-    ./configure --prefix=$BUILD_PREFIX 
-    make -j4 
-	if [ -n "$IS_OSX" ]; then sudo make install; else make install; fi
+	(cd jpeg-${JPEG_VERSION} \
+    && ./configure --prefix=$BUILD_PREFIX \
+    && make -j4 \
+    && if [ -n "$IS_OSX" ]; then sudo make install; else make install; fi)
     touch jpeg-stamp
 }