Fix builds for ARPACK-NG and Leptonica

bytedeco · Aug 17, 2024 · 28ab11a · 28ab11a
1 parent ed33b5c
commit 28ab11a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml
@@ -60,7 +60,7 @@
 <!--      <artifactId>${javacpp.moduleId}</artifactId>-->
 <!--      <version>${project.version}</version>-->
 <!--      <classifier>${javacpp.platform.linux-ppc64le}</classifier>-->
-    </dependency>
+<!--    </dependency>-->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>${javacpp.moduleId}</artifactId>

diff --git a/leptonica/cppbuild.sh b/leptonica/cppbuild.sh
@@ -108,7 +108,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -153,7 +153,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -197,7 +197,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -241,7 +241,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -282,7 +282,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -323,7 +323,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -368,7 +368,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -410,7 +410,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -452,7 +452,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -493,7 +493,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -533,7 +533,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -573,7 +573,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION
@@ -613,7 +613,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../$LIBTIFF
-        $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
+        $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
         make -j $MAKEJ
         make install
         cd ../openjpeg-$OPENJPEG_VERSION